Use a systemd timer to run the CRM job queue

[chef.git] / cookbooks / civicrm / recipes / default.rb

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index a6c4494346f2ef7048660a1f5a83433f48742bf6..0182d32492460f72f07e999148d4abd9b07be0b9 100644 (file)
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -54,7 +54,7 @@ end
 
 wordpress_theme "osmblog-wp-theme" do
   site "join.osmfoundation.org"
 
 wordpress_theme "osmblog-wp-theme" do
   site "join.osmfoundation.org"

-  repository "https://github.com/harry-wood/osmblog-wp-theme.git"
+  repository "https://github.com/osmfoundation/osmblog-wp-theme.git"

 end
 
 wordpress_plugin "registration-honeypot" do
 end
 
 wordpress_plugin "registration-honeypot" do


@@ -173,11 +173,23 @@ file "#{civicrm_directory}/civicrm.settings.php" do
   content settings
 end
 
   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"
   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
 end
 
 template "/etc/cron.daily/osmf-crm-backup" do