Tile: Add missing libapache2-mod-tile dep

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index cc2f6ea5f7df211197f4f58621cc1e6e4df7782f..8f792a37837328796561f509b717f2eb1c1a8197 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,6 +31,8 @@ apache_module "headers"
 apache_module "remoteip"
 apache_module "rewrite"
 
+package "libapache2-mod-tile"
+
 apache_module "tile" do
   conf "tile.conf.erb"
 end
@@ -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"
@@ -182,25 +188,6 @@ node[:tile][:data].each do |name,data|
   end
 end
 
-template "/usr/local/bin/render-lowzoom" do
-  source "render-lowzoom.erb"
-  owner "root"
-  group "root"
-  mode 0755
-end
-
-template "/etc/init.d/render-lowzoom" do
-  source "render-lowzoom.init.erb"
-  owner "root"
-  group "root"
-  mode 0755
-end
-
-service "render-lowzoom" do
-  action :disable
-  supports :restart => true
-end
-
 nodejs_package "carto"
 nodejs_package "millstone"
 
@@ -214,6 +201,33 @@ node[:tile][:styles].each do |name,details|
   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"
@@ -243,7 +257,7 @@ node[:tile][:styles].each do |name,details|
     group "tile"
     subscribes :run, "git[#{style_directory}]"
     notifies :restart, "service[renderd]"
-    notifies :restart, "service[render-lowzoom]"
+    notifies :restart, "service[update-lowzoom-#{name}]"
   end
 end
 
@@ -355,6 +369,13 @@ template "/usr/local/bin/expire-tiles" do
   mode 0755
 end
 
+template "/etc/sudoers.d/tile" do
+  source "sudoers.erb"
+  owner "root"
+  group "root"
+  mode 0440
+end
+
 directory "/var/lib/replicate" do
   owner "tile"
   group "tile"
@@ -396,6 +417,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"
@@ -408,4 +451,3 @@ munin_plugin "renderd_zoom_time"
 munin_plugin "replication_delay" do
   conf "munin.erb"
 end
-