X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7a8a1cf571031b7ce3e2dea20dfb75427fdc9207..e635b4b8187951f9e714d958aafd7858ee1aae1b:/cookbooks/tile/recipes/default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index d0769d2fd..85af49c46 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -38,7 +38,7 @@ end
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 
 apache_site "default" do
-  action [ :disable ]
+  action [:disable]
 end
 
 apache_site "tile.openstreetmap.org" do
@@ -62,7 +62,7 @@ end
 package "renderd"
 
 service "renderd" do
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => false, :restart => true, :reload => false
 end
 
@@ -100,12 +100,16 @@ end
 
 package "python-cairo"
 package "python-mapnik"
+
 package "ttf-dejavu"
-package "ttf-unifont"
 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"
@@ -141,7 +145,9 @@ directory "/srv/tile.openstreetmap.org/data" do
   mode 0755
 end
 
-node[:tile][:data].each do |name,data|
+package "mapnik-utils"
+
+node[:tile][:data].each_value do |data|
   url = data[:url]
   file = "/srv/tile.openstreetmap.org/data/#{File.basename(url)}"
   directory = "/srv/tile.openstreetmap.org/data/#{data[:directory]}"
@@ -209,7 +215,7 @@ node[:tile][:data].each do |name,data|
       action :create
       use_conditional_get true
     else
-      action :create_if_missing 
+      action :create_if_missing
     end
 
     source url
@@ -231,7 +237,7 @@ directory "/srv/tile.openstreetmap.org/styles" do
   mode 0755
 end
 
-node[:tile][:styles].each do |name,details|
+node[:tile][:styles].each do |name, details|
   style_directory = "/srv/tile.openstreetmap.org/styles/#{name}"
   tile_directory = "/srv/tile.openstreetmap.org/tiles/#{name}"
 
@@ -347,13 +353,7 @@ postgresql_extension "postgis" do
   database "gis"
 end
 
-[ "geography_columns",
-  "planet_osm_nodes",
-  "planet_osm_rels",
-  "planet_osm_ways",
-  "raster_columns", 
-  "raster_overviews", 
-  "spatial_ref_sys" ].each do |table|
+%w(geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews spatial_ref_sys).each do |table|
   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"
@@ -362,11 +362,7 @@ end
   end
 end
 
-[ "geometry_columns", 
-  "planet_osm_line", 
-  "planet_osm_point", 
-  "planet_osm_polygon", 
-  "planet_osm_roads" ].each do |table|
+%w(geometry_columns planet_osm_line planet_osm_point planet_osm_polygon planet_osm_roads).each do |table|
   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"
@@ -457,7 +453,7 @@ template "/etc/init.d/replicate" do
 end
 
 service "replicate" do
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :restart => true
   subscribes :restart, "template[/usr/local/bin/replicate]"
   subscribes :restart, "template[/etc/init.d/replicate]"
@@ -492,6 +488,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"
 
@@ -502,7 +505,7 @@ template "/usr/local/bin/cleanup-tiles" do
   mode 0755
 end
 
-tile_directories = node[:tile][:styles].collect do |name,style|
+tile_directories = node[:tile][:styles].collect do |_, style|
   style[:tile_directories].collect { |directory| directory[:name] }
 end.flatten.sort.uniq