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 261c0e9ede2f5be4129240d4d9b5457578bd9194..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"
@@ -216,6 +222,12 @@ node[:tile][:styles].each do |name,details|
     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"
@@ -357,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"
@@ -412,6 +431,14 @@ template "/etc/cron.d/render-lowzoom" do
   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"