From: Tom Hughes Date: Tue, 29 Nov 2022 22:22:58 +0000 (+0000) Subject: Convert donate cron job to use a systemd timer X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/04f8c85300f9189bb1d2f2a6375eadb3cf8c800d Convert donate cron job to use a systemd timer --- diff --git a/cookbooks/donate/metadata.rb b/cookbooks/donate/metadata.rb index 4c4649b1a..b5a2967ff 100644 --- 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 7389db3cf..e03973340 100644 --- 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