Convert database backups to use a systemd timer

diff --git a/cookbooks/db/metadata.rb b/cookbooks/db/metadata.rb
index d52927a7586ae52f5a8b96533d6b56363deef144..c81fffe5b35650c04ee818711ab58d14c1efeae5 100644 (file)
--- a/cookbooks/db/metadata.rb
+++ b/cookbooks/db/metadata.rb
@@ -11,4 +11,5 @@ depends           "git"
 depends           "postgresql"
 depends           "python"
 depends           "ruby"
 depends           "postgresql"
 depends           "python"
 depends           "ruby"

+depends           "systemd"

 depends           "web"
 depends           "web"

diff --git a/cookbooks/db/recipes/backup.rb b/cookbooks/db/recipes/backup.rb
index 0fe004d20f823fd4ef848f55322a594d14d611f4..39d6d573d4885a4844ee9bebe4bb4f6f39da8a50 100644 (file)
--- 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
 
   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"
   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
 end