From a785ce1d517114741055ecd5297527aa1fb52b38 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 30 Nov 2022 19:02:32 +0000 Subject: [PATCH] Use a systemd timer to run the CRM job queue --- cookbooks/civicrm/recipes/default.rb | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb index 465b5aaa3..0182d3249 100644 --- a/cookbooks/civicrm/recipes/default.rb +++ b/cookbooks/civicrm/recipes/default.rb @@ -173,11 +173,23 @@ file "#{civicrm_directory}/civicrm.settings.php" do content settings end -cron_d "osmf-crm" do - minute "*/15" +systemd_service "osmf-crm-jobs" do + description "Run CRM jobs" + exec_start "/usr/bin/php #{civicrm_directory}/civicrm/bin/cli.php -s join.osmfoundation.org -u batch -p \"#{passwords['batch']}\" -e Job -a execute" user "www-data" - command "php #{civicrm_directory}/civicrm/bin/cli.php -s join.osmfoundation.org -u batch -p \"#{passwords['batch']}\" -e Job -a execute 2>&1 | egrep -v '^PHP (Deprecated|Warning):'" - mailto "admins@openstreetmap.org" + sandbox :enable_network => true + memory_deny_write_execute false + restrict_address_families "AF_UNIX" +end + +systemd_timer "osmf-crm-jobs" do + description "Run CRM jobs" + on_boot_sec "15m" + on_unit_inactive_sec "15m" +end + +service "osmf-crm-jobs.timer" do + action [:enable, :start] end template "/etc/cron.daily/osmf-crm-backup" do -- 2.39.5