We don't need to install libapache2-mod-tile as apache_module will

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index bb7459eceb452c13303a813a1c5e6520ad5485fc..d4ed52a6051898ae9e02ff5a4d965ffb0d1c742e 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -175,6 +175,14 @@ node[:tile][:data].each do |name,data|
     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
+  end
+
   remote_file file do
     action :create_if_missing 
     source url
@@ -254,7 +262,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
@@ -308,7 +316,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"
@@ -367,6 +376,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"
@@ -433,6 +449,7 @@ end
 munin_plugin "mod_tile_fresh"
 munin_plugin "mod_tile_response"
 munin_plugin "mod_tile_zoom"
+munin_plugin "mod_tile_latency"
 
 munin_plugin "renderd_processed"
 munin_plugin "renderd_queue"