From 10ab14a11f21528e0e50ee33d0cdd983c8db000c Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 27 Nov 2022 19:55:06 +0000 Subject: [PATCH] Convert planet file cleanup to use a systemd timer --- cookbooks/planet/recipes/default.rb | 28 +++++++++++++------ ...le-cleanup.erb => planet-file-cleanup.erb} | 0 2 files changed, 19 insertions(+), 9 deletions(-) rename cookbooks/planet/templates/default/{old-planet-file-cleanup.erb => planet-file-cleanup.erb} (100%) diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb index ceb9d9ad5..4dbd51a7d 100644 --- a/cookbooks/planet/recipes/default.rb +++ b/cookbooks/planet/recipes/default.rb @@ -130,19 +130,29 @@ end munin_plugin "planet_age" -template "/usr/local/bin/old-planet-file-cleanup" do - source "old-planet-file-cleanup.erb" +template "/usr/local/bin/planet-file-cleanup" do + source "planet-file-cleanup.erb" owner "root" group "root" mode "755" end -cron_d "old-planet-file-cleanup" do - comment "run this on the first monday of the month at 3:44am" - minute "44" - hour "3" - day "1-7" +systemd_service "planet-file-cleanup" do + description "Cleanup old planet files" + exec_start "/usr/local/bin/planet-file-cleanup --debug" user "www-data" - command "test $(date +\\%u) -eq 1 && /usr/local/bin/old-planet-file-cleanup --debug" - mailto "zerebubuth@gmail.com" + sandbox true + read_write_paths [ + node[:planet][:dump][:xml_directory], + node[:planet][:dump][:pbf_directory] + ] +end + +systemd_timer "planet-file-cleanup" do + description "Cleanup old planet files" + on_calendar "Mon *-*-1..7 03:44" +end + +service "planet-file-cleanup.timer" do + action [:enable, :start] end diff --git a/cookbooks/planet/templates/default/old-planet-file-cleanup.erb b/cookbooks/planet/templates/default/planet-file-cleanup.erb similarity index 100% rename from cookbooks/planet/templates/default/old-planet-file-cleanup.erb rename to cookbooks/planet/templates/default/planet-file-cleanup.erb -- 2.43.2