Update carto stylesheet to v2.41.0

[chef.git] / cookbooks / tile / recipes / default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 9c219e62db48e8cf22689164b05cdf17e7634b50..8e5b4ecf47aea8e9f02e62fab2bda47b4de8f798 100644 (file)
--- 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
@@ -50,68 +51,79 @@ template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 directory "/srv/tile.openstreetmap.org" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 package "renderd"
 
 service "renderd" do
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => false, :restart => true, :reload => false
 end
 
 directory "/srv/tile.openstreetmap.org/tiles" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/renderd.conf" do
   source "renderd.conf.erb"
   owner "root"
   group "root"
-  mode 0644
-  notifies :reload, resources(:service => "apache2")
-  notifies :restart, resources(:service => "renderd")
+  mode 0o644
+  notifies :reload, "service[apache2]"
+  notifies :restart, "service[renderd]"
 end
 
 remote_directory "/srv/tile.openstreetmap.org/html" do
   source "html"
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
   files_owner "tile"
   files_group "tile"
-  files_mode 0644
+  files_mode 0o644
 end
 
 template "/srv/tile.openstreetmap.org/html/index.html" do
   source "index.html.erb"
   owner "tile"
   group "tile"
-  mode 0644
+  mode 0o644
 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 "fonts-beng-extra"
+package "fonts-gargi"
+package "fonts-taml-tscu"
+package "fonts-tibetan-machine"
+
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 template "/srv/tile.openstreetmap.org/cgi-bin/export" do
   source "export.erb"
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
   variables :blocks => blocks
 end
 
@@ -119,23 +131,25 @@ template "/srv/tile.openstreetmap.org/cgi-bin/debug" do
   source "debug.erb"
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/cron.hourly/export" do
   source "export.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 directory "/srv/tile.openstreetmap.org/data" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 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]}"
@@ -143,7 +157,7 @@ node[:tile][:data].each do |name,data|
   directory directory do
     owner "tile"
     group "tile"
-    mode 0755
+    mode 0o755
   end
 
   if file =~ /\.tgz$/
@@ -169,43 +183,36 @@ node[:tile][:data].each do |name,data|
 
     execute file do
       action :nothing
-      command "unzip -qq #{file} -d #{directory}"
+      command "unzip -qq -o #{file} -d #{directory}"
       user "tile"
       group "tile"
     end
   end
 
-  if data[:processed]
-    original = "#{directory}/#{data[:original]}"
-    processed = "#{directory}/#{data[:processed]}"
-
-    package "gdal-bin"
-
-    execute processed do
-      action :nothing
-      command "ogr2ogr #{processed} #{original}"
-      user "tile"
-      group "tile"
-      subscribes :run, resources(:execute => file), :immediately
-    end
-  end
-
   execute "#{file}_shapeindex" do
     action :nothing
     command "find #{directory} -type f -iname '*.shp' -print0 | xargs -0 --no-run-if-empty shapeindex --shape_files"
     user "tile"
-    user "tile"
-    subscribes :run, resources(:execute => file), :immediately
+    group "tile"
+    subscribes :run, "execute[#{file}]", :immediately
   end
 
   remote_file file do
-    action :create_if_missing 
+    if data[:refresh]
+      action :create
+      use_conditional_get true
+      ignore_failure true
+    else
+      action :create_if_missing
+    end
+
     source url
     owner "tile"
     group "tile"
-    mode 0644
-    notifies :run, resources(:execute => file), :immediately
-    notifies :restart, resources(:service => "renderd")
+    mode 0o644
+    backup false
+    notifies :run, "execute[#{file}]", :immediately
+    notifies :restart, "service[renderd]"
   end
 end
 
@@ -215,10 +222,10 @@ nodejs_package "millstone"
 directory "/srv/tile.openstreetmap.org/styles" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 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}"
 
@@ -226,7 +233,7 @@ node[:tile][:styles].each do |name,details|
     source "update-lowzoom.erb"
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
     variables :style => name
   end
 
@@ -234,7 +241,7 @@ node[:tile][:styles].each do |name,details|
     source "update-lowzoom.init.erb"
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
     variables :style => name
   end
 
@@ -246,15 +253,21 @@ node[:tile][:styles].each do |name,details|
   directory tile_directory do
     owner "tile"
     group "tile"
-    mode 0755
+    mode 0o755
   end
 
   details[:tile_directories].each do |directory|
+    directory directory[:name] do
+      owner "www-data"
+      group "www-data"
+      mode 0o755
+    end
+
     directory[:min_zoom].upto(directory[:max_zoom]) do |zoom|
-      directory  "#{directory[:name]}/#{zoom}" do
+      directory "#{directory[:name]}/#{zoom}" do
         owner "www-data"
         group "www-data"
-        mode 0755
+        mode 0o755
       end
 
       link "#{tile_directory}/#{zoom}" do
@@ -269,7 +282,7 @@ node[:tile][:styles].each do |name,details|
     action :create_if_missing
     owner "tile"
     group "tile"
-    mode 0444
+    mode 0o444
   end
 
   git style_directory do
@@ -328,13 +341,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"
@@ -343,11 +350,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"
@@ -361,125 +364,154 @@ postgresql_munin "gis" do
   database "gis"
 end
 
-#file node[:tile][:node_file] do
-#  owner "tile"
-#  group "www-data"
-#  mode 0640
-#end
+file node[:tile][:node_file] do
+  owner "tile"
+  group "www-data"
+  mode 0o640
+end
 
 directory "/var/log/tile" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 package "osm2pgsql"
 package "osmosis"
 
 package "ruby"
-package "rubygems"
+package "ruby-dev"
 
 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"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   files_owner "root"
   files_group "root"
-  files_mode 0644
+  files_mode 0o644
 end
 
 template "/usr/local/bin/expire-tiles" do
   source "expire-tiles.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/sudoers.d/tile" do
   source "sudoers.erb"
   owner "root"
   group "root"
-  mode 0440
+  mode 0o440
 end
 
 directory "/var/lib/replicate" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 template "/var/lib/replicate/configuration.txt" do
   source "replicate.configuration.erb"
   owner "tile"
   group "tile"
-  mode 0644
+  mode 0o644
 end
 
 template "/usr/local/bin/replicate" do
   source "replicate.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/init.d/replicate" do
   source "replicate.init.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 service "replicate" do
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :restart => true
-  subscribes :restart, resources(:template => "/usr/local/bin/replicate")
-  subscribes :restart, resources(:template => "/etc/init.d/replicate")
+  subscribes :restart, "template[/usr/local/bin/replicate]"
+  subscribes :restart, "template[/etc/init.d/replicate]"
 end
 
 template "/etc/logrotate.d/replicate" do
   source "replicate.logrotate.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 template "/usr/local/bin/render-lowzoom" do
   source "render-lowzoom.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/cron.d/render-lowzoom" do
   source "render-lowzoom.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o644
 end
 
 template "/etc/rsyslog.d/20-renderd.conf" do
   source "renderd.rsyslog.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[rsyslog]"
 end
 
+template "/etc/logrotate.d/renderd" do
+  source "renderd.logrotate.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+end
+
+package "liblockfile-simple-perl"
+package "libfilesys-df-perl"
+
+template "/usr/local/bin/cleanup-tiles" do
+  source "cleanup-tiles.erb"
+  owner "root"
+  group "root"
+  mode 0o755
+end
+
+tile_directories = node[:tile][:styles].collect do |_, style|
+  style[:tile_directories].collect { |directory| directory[:name] }
+end.flatten.sort.uniq
+
+template "/etc/cron.d/cleanup-tiles" do
+  source "cleanup-tiles.cron.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+  variables :directories => tile_directories
+end
+
 munin_plugin "mod_tile_fresh"
+munin_plugin "mod_tile_latency"
 munin_plugin "mod_tile_response"
 munin_plugin "mod_tile_zoom"
-munin_plugin "mod_tile_latency"
 
 munin_plugin "renderd_processed"
 munin_plugin "renderd_queue"
+munin_plugin "renderd_queue_time"
 munin_plugin "renderd_zoom"
 munin_plugin "renderd_zoom_time"