X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1b14ff117d278cd2149eb6f39d68e545efb54033..6270f0b685e414b82dd311ad99fe4df0c3e2bfd6:/cookbooks/tilecache/recipes/default.rb

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index e6e848ce1..d3f1dccfa 100644
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -108,7 +108,7 @@ template "/etc/logrotate.d/squid" do
   source "logrotate.squid.erb"
   owner "root"
   group "root"
-  mode 0o644
+  mode "644"
 end
 
 nginx_site "default" do
@@ -119,15 +119,30 @@ template "/usr/local/bin/nginx_generate_tilecache_qos_map" do
   source "nginx_generate_tilecache_qos_map.erb"
   owner "root"
   group "root"
-  mode 0o750
+  mode "750"
   variables :totp_key => web_passwords["totp_key"]
 end
 
-template "/etc/cron.d/tilecache" do
-  source "cron.erb"
-  owner "root"
-  group "root"
-  mode 0o644
+cron_d "tilecache" do
+  action :delete
+end
+
+cron_d "tilecache-generate-qos-map" do
+  minute "0"
+  user "root"
+  command "/usr/local/bin/nginx_generate_tilecache_qos_map"
+end
+
+cron_d "tilecache-curl-time" do
+  user "www-data"
+  command "/srv/tilecache/tilecache-curl-time"
+end
+
+cron_d "tilecache-curl-time-cleanup" do
+  minute "15"
+  hour "0"
+  user "www-data"
+  command "/srv/tilecache/tilecache-curl-time-cleanup"
 end
 
 execute "execute_nginx_generate_tilecache_qos_map" do
@@ -157,7 +172,7 @@ template "/etc/logrotate.d/nginx" do
   source "logrotate.nginx.erb"
   owner "root"
   group "root"
-  mode 0o644
+  mode "644"
 end
 
 fail2ban_jail "squid" do
@@ -172,43 +187,40 @@ tilerenders.each do |render|
   end
 end
 
-template "/etc/cron.d/tilecache" do
-  source "cron.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-end
-
 directory "/srv/tilecache" do
   owner "root"
   group "root"
-  mode 0o755
+  mode "755"
 end
 
 directory "/srv/tilecache/data" do
   owner "www-data"
   group "www-data"
-  mode 0o755
+  mode "755"
 end
 
 cookbook_file "/srv/tilecache/tilecache-curl-time.txt" do
   source "tilecache-curl-time.txt"
   owner "root"
   group "root"
-  mode 0o755
+  mode "755"
 end
 
 template "/srv/tilecache/tilecache-curl-time" do
   source "tilecache-curl-time.erb"
   owner "root"
   group "root"
-  mode 0o755
+  mode "755"
   variables :caches => tilecaches, :renders => tilerenders
 end
 
-template "/srv/tilecache/tilecache-fastest-peers" do
-  source "tilecache-fastest-peers.erb"
+template "/srv/tilecache/tilecache-curl-time-cleanup" do
+  source "tilecache-curl-time-cleanup.erb"
   owner "root"
   group "root"
-  mode 0o755
+  mode "755"
+end
+
+ohai_plugin "tilecache" do
+  template "ohai.rb.erb"
 end