Tile: restart renderd immediately on style update

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index f39c31623768cca3fdcad1cef14bca9291ae4873..8af830cddd73909ffd3d16e90c33ee6f90530533 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -31,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
@@ -220,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"
@@ -248,7 +256,7 @@ node[:tile][:styles].each do |name,details|
     user "tile"
     group "tile"
     subscribes :run, "git[#{style_directory}]"
-    notifies :restart, "service[renderd]"
+    notifies :restart, "service[renderd]", :immediately
     notifies :restart, "service[update-lowzoom-#{name}]"
   end
 end
@@ -302,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"
@@ -361,6 +370,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"