Rework tile expiry script to use the flat node cache

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 837d478a6cfdf962cd7ac0f73f31c8cd1acaad84..14d81f1396b625b448b176f4690af573657cb26c 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -31,8 +31,6 @@ apache_module "headers"
 apache_module "remoteip"
 apache_module "rewrite"
 
-package "libapache2-mod-tile"
-
 apache_module "tile" do
   conf "tile.conf.erb"
 end
@@ -177,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
@@ -256,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
@@ -310,8 +316,7 @@ end
   "planet_osm_line", 
   "planet_osm_point", 
   "planet_osm_polygon", 
-  "planet_osm_roads",
-  "planet_osm_nodes" ].each do |table|
+  "planet_osm_roads" ].each do |table|
   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"
@@ -325,12 +330,10 @@ postgresql_munin "gis" do
   database "gis"
 end
 
-#if node[:tile][:node_file]
-#  file node[:tile][:node_file] do
-#    owner "tile"
-#    group "tile"
-#    mode 0664
-#  end
+#file node[:tile][:node_file] do
+#  owner "tile"
+#  group "www-data"
+#  mode 0640
 #end
 
 directory "/var/log/tile" do
@@ -347,11 +350,10 @@ package "rubygems"
 
 package "libproj-dev"
 package "libxml2-dev"
-package "libpq-dev"
 
 gem_package "proj4rb"
 gem_package "libxml-ruby"
-gem_package "pg"
+gem_package "mmap"
 
 remote_directory "/usr/local/lib/site_ruby" do
   source "ruby"
@@ -443,6 +445,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"