X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3df53dba22117390f55bc350d47ae0e25b19e85d..13d1e4cec43f3af07ac845c241a5e1782f4e6d74:/cookbooks/tile/recipes/default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 9c219e62d..6516831e2 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -169,7 +169,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
@@ -199,7 +199,13 @@ node[:tile][:data].each do |name,data|
   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"
@@ -462,7 +468,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 +479,35 @@ template "/etc/rsyslog.d/20-renderd.conf" do
   notifies :restart, "service[rsyslog]"
 end
 
+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"