Tile: tile-expiry (www-data) needs access to planet_osm_nodes table

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index d60d52c2c3c238009a47eb11bf5e4d3cdc39a633..837d478a6cfdf962cd7ac0f73f31c8cd1acaad84 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -21,6 +21,7 @@ include_recipe "apache"
 include_recipe "git"
 include_recipe "nodejs"
 include_recipe "postgresql"
+include_recipe "tools"
 
 blocks = data_bag_item("tile", "blocks")
 
@@ -30,11 +31,13 @@ apache_module "headers"
 apache_module "remoteip"
 apache_module "rewrite"
 
+package "libapache2-mod-tile"
+
 apache_module "tile" do
   conf "tile.conf.erb"
 end
 
-tilecaches = search(:node, "roles:tilecache")
+tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 
 apache_site "default" do
   action [ :disable ]
@@ -96,6 +99,9 @@ remote_directory "/srv/tile.openstreetmap.org/html" do
   files_mode 0644
 end
 
+package "python-cairo"
+package "python-mapnik"
+
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"
@@ -192,9 +198,44 @@ directory "/srv/tile.openstreetmap.org/styles" do
 end
 
 node[:tile][:styles].each do |name,details|
-  directory = "/srv/tile.openstreetmap.org/styles/#{name}"
+  style_directory = "/srv/tile.openstreetmap.org/styles/#{name}"
+  tile_directory = "/srv/tile.openstreetmap.org/tiles/#{name}"
+
+  template "/usr/local/bin/update-lowzoom-#{name}" do
+    source "update-lowzoom.erb"
+    owner "root"
+    group "root"
+    mode 0755
+    variables :style => name
+  end
+
+  template "/etc/init.d/update-lowzoom-#{name}" do
+    source "update-lowzoom.init.erb"
+    owner "root"
+    group "root"
+    mode 0755
+    variables :style => name
+  end
+
+  service "update-lowzoom-#{name}" do
+    action :disable
+    supports :restart => true
+  end
+
+  directory tile_directory do
+    owner "tile"
+    group "www-data"
+    mode 0775
+  end
+
+  file "#{tile_directory}/planet-import-complete" do
+    action :create_if_missing
+    owner "tile"
+    group "tile"
+    mode 0444
+  end
 
-  git directory do
+  git style_directory do
     action :sync
     repository details[:repository]
     revision details[:revision]
@@ -202,22 +243,21 @@ node[:tile][:styles].each do |name,details|
     group "tile"
   end
 
-  link "#{directory}/data" do
+  link "#{style_directory}/data" do
     to "/srv/tile.openstreetmap.org/data"
     owner "tile"
     group "tile"
   end
 
-  execute "#{directory}/project.mml" do
+  execute "#{style_directory}/project.mml" do
+    action :nothing
     command "carto project.mml > project.xml"
-    cwd directory
+    cwd style_directory
     user "tile"
     group "tile"
-    not_if do
-      File.exist?("#{directory}/project.xml") and
-      File.mtime("#{directory}/project.xml") >= File.mtime("#{directory}/project.mml")
-    end
-    notifies :restart, resources(:service => "renderd")
+    subscribes :run, "git[#{style_directory}]"
+    notifies :restart, "service[renderd]"
+    notifies :restart, "service[update-lowzoom-#{name}]"
   end
 end
 
@@ -270,7 +310,8 @@ end
   "planet_osm_line", 
   "planet_osm_point", 
   "planet_osm_polygon", 
-  "planet_osm_roads" ].each do |table|
+  "planet_osm_roads",
+  "planet_osm_nodes" ].each do |table|
   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"
@@ -292,6 +333,12 @@ end
 #  end
 #end
 
+directory "/var/log/tile" do
+  owner "tile"
+  group "tile"
+  mode 0755
+end
+
 package "osm2pgsql"
 package "osmosis"
 
@@ -323,13 +370,14 @@ template "/usr/local/bin/expire-tiles" do
   mode 0755
 end
 
-directory "/var/lib/replicate" do
-  owner "tile"
-  group "tile"
-  mode 0755
+template "/etc/sudoers.d/tile" do
+  source "sudoers.erb"
+  owner "root"
+  group "root"
+  mode 0440
 end
 
-directory "/var/log/replicate" do
+directory "/var/lib/replicate" do
   owner "tile"
   group "tile"
   mode 0755
@@ -370,6 +418,28 @@ template "/etc/logrotate.d/replicate" do
   mode 0644
 end
 
+template "/usr/local/bin/render-lowzoom" do
+  source "render-lowzoom.erb"
+  owner "root"
+  group "root"
+  mode 0755
+end
+
+template "/etc/cron.d/render-lowzoom" do
+  source "render-lowzoom.cron.erb"
+  owner "root"
+  group "root"
+  mode 0755
+end
+
+template "/etc/rsyslog.d/20-renderd.conf" do
+  source "renderd.rsyslog.erb"
+  owner "root"
+  group "root"
+  mode 0644
+  notifies :restart, "service[rsyslog]"
+end
+
 munin_plugin "mod_tile_fresh"
 munin_plugin "mod_tile_response"
 munin_plugin "mod_tile_zoom"
@@ -382,4 +452,3 @@ munin_plugin "renderd_zoom_time"
 munin_plugin "replication_delay" do
   conf "munin.erb"
 end
-