X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6da8c71cb11f27690cb9a3a6cbbbec813e2a3ba2..d2c52bed02efb52ef7d14c3e0dda34508aefdd52:/cookbooks/tile/recipes/default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index b88e18c2c..ee13978a5 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -187,11 +187,22 @@ template "/srv/tile.openstreetmap.org/cgi-bin/debug" do
   mode "755"
 end
 
-template "/etc/cron.hourly/export" do
-  source "export.cron.erb"
-  owner "root"
-  group "root"
-  mode "755"
+systemd_service "export-cleanup" do
+  description "Cleanup stale export temporary files"
+  joins_namespace_of "apache2.service"
+  exec_start "find /tmp -ignore_readdir_race -name 'export??????' -mmin +60 -delete"
+  user "www-data"
+  sandbox true
+end
+
+systemd_timer "export-cleanup" do
+  description "Cleanup stale export temporary files"
+  on_boot_sec "60m"
+  on_unit_inactive_sec "60m"
+end
+
+service "export-cleanup.timer" do
+  action [:enable, :start]
 end
 
 directory "/srv/tile.openstreetmap.org/data" do
@@ -687,13 +698,9 @@ systemd_timer "cleanup-tiles@" do
 end
 
 tile_directories.each do |directory|
-  label = directory.gsub("/", "-")
-
-  cron_d "cleanup-tiles#{label}" do
-    action :delete
-  end
+  label = directory[1..].gsub("/", "-")
 
-  service "cleanup-tiles@#{label[1..]}.timer" do
+  service "cleanup-tiles@#{label}.timer" do
     action [:enable, :start]
   end
 end