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 6943b0f3a32448968d0859771de4321a57e74ed1..0182d32492460f72f07e999148d4abd9b07be0b9 100644 (file)
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -24,8 +24,9 @@ package %w[
   php-xml
   php-curl
   rsync
   php-xml
   php-curl
   rsync

-  unzip

   wkhtmltopdf
   wkhtmltopdf

+  php-bcmath
+  php-intl

 ]
 
 cache_dir = Chef::Config[:file_cache_path]
 ]
 
 cache_dir = Chef::Config[:file_cache_path]


@@ -48,24 +49,23 @@ wordpress_site "join.osmfoundation.org" do
   database_name "civicrm"
   database_user "civicrm"
   database_password database_password
   database_name "civicrm"
   database_user "civicrm"
   database_password database_password

+  fpm_prometheus_port 11301

 end
 
 wordpress_theme "osmblog-wp-theme" do
   site "join.osmfoundation.org"
 end
 
 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
   site "join.osmfoundation.org"
 end
 
 end
 
 wordpress_plugin "registration-honeypot" do
   site "join.osmfoundation.org"
 end
 

-wordpress_plugin "sitepress-multilingual-cms" do
+wordpress_plugin "contact-form-7" do

   site "join.osmfoundation.org"
   site "join.osmfoundation.org"

-  repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
-  not_if { ENV["TEST_KITCHEN"] }

 end
 
 end
 

-wordpress_plugin "contact-form-7" do
+wordpress_plugin "civicrm-admin-utilities" do

   site "join.osmfoundation.org"
 end
 
   site "join.osmfoundation.org"
 end
 


@@ -96,22 +96,22 @@ remote_file "#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz" do
   backup false
 end
 
   backup false
 end
 

-execute "#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip" do
+archive_file "#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip" do

   action :nothing
   action :nothing

-  command "unzip -o -qq #{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip"
-  cwd "/opt/civicrm-#{civicrm_version}"
-  user "wordpress"
+  destination "/opt/civicrm-#{civicrm_version}"
+  overwrite true
+  owner "wordpress"

   group "wordpress"
   group "wordpress"

-  subscribes :run, "remote_file[#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip]", :immediately
+  subscribes :extract, "remote_file[#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip]", :immediately

 end
 
 end
 

-execute "#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz" do
+archive_file "#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz" do

   action :nothing
   action :nothing

-  command "tar -zxf #{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz"
-  cwd "/opt/civicrm-#{civicrm_version}/civicrm"
-  user "wordpress"
+  destination "/opt/civicrm-#{civicrm_version}/civicrm"
+  overwrite true
+  owner "wordpress"

   group "wordpress"
   group "wordpress"

-  subscribes :run, "remote_file[#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz]", :immediately
+  subscribes :extract, "remote_file[#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz]", :immediately

 end
 
 execute "/opt/civicrm-#{civicrm_version}/civicrm" do
 end
 
 execute "/opt/civicrm-#{civicrm_version}/civicrm" do


@@ -119,8 +119,8 @@ execute "/opt/civicrm-#{civicrm_version}/civicrm" do
   command "rsync --archive --delete /opt/civicrm-#{civicrm_version}/civicrm/ #{civicrm_directory}"
   user "wordpress"
   group "wordpress"
   command "rsync --archive --delete /opt/civicrm-#{civicrm_version}/civicrm/ #{civicrm_directory}"
   user "wordpress"
   group "wordpress"

-  subscribes :run, "execute[#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip]", :immediately
-  subscribes :run, "execute[#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz]", :immediately
+  subscribes :run, "archive_file[#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip]", :immediately
+  subscribes :run, "archive_file[#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz]", :immediately

 end
 
 directory "/srv/join.osmfoundation.org/wp-content/uploads" do
 end
 
 directory "/srv/join.osmfoundation.org/wp-content/uploads" 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