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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 8d3b2e8dc..4ab6b8bbd 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -26,6 +26,7 @@ include_recipe "tools"
 blocks = data_bag_item("tile", "blocks")
 
 apache_module "alias"
+apache_module "cgi"
 apache_module "expires"
 apache_module "headers"
 apache_module "remoteip"
@@ -38,7 +39,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 +63,7 @@ end
 package "renderd"
 
 service "renderd" do
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => false, :restart => true, :reload => false
 end
 
@@ -101,6 +102,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"
@@ -135,7 +146,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]}"
@@ -202,8 +215,9 @@ node[:tile][:data].each do |name,data|
     if data[:refresh]
       action :create
       use_conditional_get true
+      ignore_failure true
     else
-      action :create_if_missing 
+      action :create_if_missing
     end
 
     source url
@@ -225,7 +239,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}"
 
@@ -341,13 +355,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"
@@ -356,11 +364,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"
@@ -374,18 +378,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
@@ -398,14 +394,17 @@ package "osm2pgsql"
 package "osmosis"
 
 package "ruby"
-package "rubygems"
+package "ruby-dev"
+
+if node[:lsb][:release].to_f < 14.04
+  package "rubygems"
+end
 
 package "libproj-dev"
 package "libxml2-dev"
 
 gem_package "proj4rb"
 gem_package "libxml-ruby"
-gem_package "mmap"
 
 remote_directory "/usr/local/lib/site_ruby" do
   source "ruby"
@@ -459,7 +458,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]"
@@ -494,6 +493,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"
 
@@ -504,7 +510,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