Install curl and subversion for taginfo

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 9c219e62db48e8cf22689164b05cdf17e7634b50..6b3e7b9c98f57b9955da8c5c8d59c712976ec15e 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -77,8 +77,8 @@ template "/etc/renderd.conf" do
   owner "root"
   group "root"
   mode 0644
-  notifies :reload, resources(:service => "apache2")
-  notifies :restart, resources(:service => "renderd")
+  notifies :reload, "service[apache2]"
+  notifies :restart, "service[renderd]"
 end
 
 remote_directory "/srv/tile.openstreetmap.org/html" do
@@ -100,6 +100,8 @@ end
 
 package "python-cairo"
 package "python-mapnik"
+package "ttf-dejavu"
+package "ttf-unifont"
 
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
@@ -169,7 +171,7 @@ node[:tile][:data].each do |name,data|
 
     execute file do
       action :nothing
-      command "unzip -qq #{file} -d #{directory}"
+      command "unzip -qq -o #{file} -d #{directory}"
       user "tile"
       group "tile"
     end
@@ -186,7 +188,7 @@ node[:tile][:data].each do |name,data|
       command "ogr2ogr #{processed} #{original}"
       user "tile"
       group "tile"
-      subscribes :run, resources(:execute => file), :immediately
+      subscribes :run, "execute[#{file}]", :immediately
     end
   end
 
@@ -194,18 +196,25 @@ node[:tile][:data].each do |name,data|
     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
+    group "tile"
+    subscribes :run, "execute[#{file}]", :immediately
   end
 
   remote_file file do
-    action :create_if_missing 
+    if data[:refresh]
+      action :create
+      use_conditional_get true
+    else
+      action :create_if_missing 
+    end
+
     source url
     owner "tile"
     group "tile"
     mode 0644
-    notifies :run, resources(:execute => file), :immediately
-    notifies :restart, resources(:service => "renderd")
+    backup false
+    notifies :run, "execute[#{file}]", :immediately
+    notifies :restart, "service[renderd]"
   end
 end
 
@@ -250,8 +259,14 @@ node[:tile][:styles].each do |name,details|
   end
 
   details[:tile_directories].each do |directory|
+    directory directory[:name] do
+      owner "www-data"
+      group "www-data"
+      mode 0755
+    end
+
     directory[:min_zoom].upto(directory[:max_zoom]) do |zoom|
-      directory  "#{directory[:name]}/#{zoom}" do
+      directory "#{directory[:name]}/#{zoom}" do
         owner "www-data"
         group "www-data"
         mode 0755
@@ -361,11 +376,11 @@ postgresql_munin "gis" do
   database "gis"
 end
 
-#file node[:tile][:node_file] do
-#  owner "tile"
-#  group "www-data"
-#  mode 0640
-#end
+file node[:tile][:node_file] do
+  owner "tile"
+  group "www-data"
+  mode 0640
+end
 
 directory "/var/log/tile" do
   owner "tile"
@@ -440,8 +455,8 @@ end
 service "replicate" do
   action [ :enable, :start ]
   supports :restart => true
-  subscribes :restart, resources(:template => "/usr/local/bin/replicate")
-  subscribes :restart, resources(:template => "/etc/init.d/replicate")
+  subscribes :restart, "template[/usr/local/bin/replicate]"
+  subscribes :restart, "template[/etc/init.d/replicate]"
 end
 
 template "/etc/logrotate.d/replicate" do
@@ -462,7 +477,7 @@ template "/etc/cron.d/render-lowzoom" do
   source "render-lowzoom.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0644
 end
 
 template "/etc/rsyslog.d/20-renderd.conf" do
@@ -473,13 +488,36 @@ template "/etc/rsyslog.d/20-renderd.conf" do
   notifies :restart, "service[rsyslog]"
 end
 
+package "liblockfile-simple-perl"
+package "libfilesys-df-perl"
+
+template "/usr/local/bin/cleanup-tiles" do
+  source "cleanup-tiles.erb"
+  owner "root"
+  group "root"
+  mode 0755
+end
+
+tile_directories = node[:tile][:styles].collect do |name,style|
+  style[:tile_directories].collect { |directory| directory[:name] }
+end.flatten.sort.uniq
+
+template "/etc/cron.d/cleanup-tiles" do
+  source "cleanup-tiles.cron.erb"
+  owner "root"
+  group "root"
+  mode 0644
+  variables :directories => tile_directories
+end
+
 munin_plugin "mod_tile_fresh"
+munin_plugin "mod_tile_latency"
 munin_plugin "mod_tile_response"
 munin_plugin "mod_tile_zoom"
-munin_plugin "mod_tile_latency"
 
 munin_plugin "renderd_processed"
 munin_plugin "renderd_queue"
+munin_plugin "renderd_queue_time"
 munin_plugin "renderd_zoom"
 munin_plugin "renderd_zoom_time"