X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9a3fee3b9f30028f6c0ee703dbf9ce86b4bab17b..b09d9f97fea24b4a1f56a97724d13752d6340996:/cookbooks/tile/recipes/default.rb?ds=inline

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 8d3b2e8dc..6cb1b9acb 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -101,6 +101,16 @@ end
 package "python-cairo"
 package "python-mapnik"
 
+package "ttf-dejavu"
+package "fonts-droid"
+package "ttf-unifont"
+package "fonts-sipa-arundina"
+package "fonts-sil-padauk"
+package "fonts-khmeros"
+package "ttf-indic-fonts-core"
+package "ttf-tamil-fonts"
+package "ttf-kannada-fonts"
+
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"
@@ -374,18 +384,10 @@ postgresql_munin "gis" do
   database "gis"
 end
 
-tile_uid = node[:etc][:passwd][:"tile"][:uid]
-www_data_gid = node[:etc][:group][:"www-data"][:gid]
-
-ruby_block node[:tile][:node_file] do
-  block do
-    File.chown(tile_uid, www_data_gid, node[:tile][:node_file])
-    File.chmod(0640, node[:tile][:node_file])
-  end
-  not_if do
-    stat = File.stat(node[:tile][:node_file])
-    stat.uid == tile_uid && stat.gid == www_data_gid && stat.mode == 0640
-  end
+file node[:tile][:node_file] do
+  owner "tile"
+  group "www-data"
+  mode 0640
 end
 
 directory "/var/log/tile" do
@@ -494,6 +496,13 @@ template "/etc/rsyslog.d/20-renderd.conf" do
   notifies :restart, "service[rsyslog]"
 end
 
+template "/etc/logrotate.d/renderd" do
+  source "renderd.logrotate.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end
+
 package "liblockfile-simple-perl"
 package "libfilesys-df-perl"