Convert donate cron job to use a systemd timer

diff --git a/cookbooks/donate/metadata.rb b/cookbooks/donate/metadata.rb
index 4c4649b1a065a93c72365c35e75aab9fe109b70f..b5a2967ff44b6ed8ea37828f1d6cc50cd1316cd6 100644 (file)
--- a/cookbooks/donate/metadata.rb
+++ b/cookbooks/donate/metadata.rb
@@ -11,3 +11,4 @@ depends           "apache"
 depends           "git"
 depends           "mysql"
 depends           "php"
+depends           "systemd"

diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index 7389db3cf7297af4a8f78a7c320d2712b7fc8646..e03973340433979d0c6e27dc793cb7d38f4287f2 100644 (file)
--- a/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@ -90,10 +90,25 @@ apache_site "donate.openstreetmap.org" do
   template "apache.erb"
 end
 
-cron_d "osmf-donate" do
-  minute "*/2"
+systemd_service "osmf-donate" do
+  description "Update donation list"
+  exec_start "/usr/bin/php /srv/donate.openstreetmap.org/scripts/update_csv_donate2016.php"
+  working_directory "/srv/donate.openstreetmap.org/scripts"
   user "donate"
-  command "cd /srv/donate.openstreetmap.org/scripts/; /usr/bin/php /srv/donate.openstreetmap.org/scripts/update_csv_donate2016.php"
+  sandbox true
+  memory_deny_write_execute true
+  restrict_address_families "AF_UNIX"
+  read_write_paths "/srv/donate.openstreetmap.org/data"
+end
+
+systemd_timer "osmf-donate" do
+  description "Update donation list"
+  on_boot_sec "2m"
+  on_unit_inactive_sec "2m"
+end
+
+service "osmf-donate.timer" do
+  action [:enable, :start]
 end
 
 template "/etc/cron.daily/osmf-donate-backup" do