From 16626915c25d32911e6136122f508a184ced305d Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 4 Dec 2022 11:05:23 +0000 Subject: [PATCH] Convert database backups to use a systemd timer --- cookbooks/db/metadata.rb | 1 + cookbooks/db/recipes/backup.rb | 21 +++++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/cookbooks/db/metadata.rb b/cookbooks/db/metadata.rb index d52927a75..c81fffe5b 100644 --- a/cookbooks/db/metadata.rb +++ b/cookbooks/db/metadata.rb @@ -11,4 +11,5 @@ depends "git" depends "postgresql" depends "python" depends "ruby" +depends "systemd" depends "web" diff --git a/cookbooks/db/recipes/backup.rb b/cookbooks/db/recipes/backup.rb index 0fe004d20..39d6d573d 100644 --- a/cookbooks/db/recipes/backup.rb +++ b/cookbooks/db/recipes/backup.rb @@ -24,11 +24,20 @@ template "/usr/local/bin/backup-db" do mode "755" end -cron_d "backup-db" do - minute "00" - hour "02" - weekday "1" +systemd_service "backup-db" do + description "Database backup" + exec_start "/usr/local/bin/backup-db" user "osmbackup" - command "/usr/local/bin/backup-db" - mailto "admins@openstreetmap.org" + sandbox :enable_network => true + restrict_address_families "AF_UNIX" + read_write_paths "/store/backup" +end + +systemd_timer "backup-db" do + description "Database backup" + on_calendar "Mon 02:00 #{node[:timezone]}" +end + +service "backup-db.timer" do + action [:enable, :start] end -- 2.39.5