X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9504c62303d2a0f8c831b183f27b7cb072faccab..2915ebac652fcc0521325cf1aae5a2f56f792549:/cookbooks/civicrm/recipes/default.rb diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb index 7252f61f9..a6c449434 100644 --- a/cookbooks/civicrm/recipes/default.rb +++ b/cookbooks/civicrm/recipes/default.rb @@ -21,9 +21,12 @@ include_recipe "wordpress" include_recipe "mysql" package %w[ + php-xml + php-curl rsync - unzip wkhtmltopdf + php-bcmath + php-intl ] cache_dir = Chef::Config[:file_cache_path] @@ -46,6 +49,7 @@ wordpress_site "join.osmfoundation.org" do database_name "civicrm" database_user "civicrm" database_password database_password + fpm_prometheus_port 11301 end wordpress_theme "osmblog-wp-theme" do @@ -57,13 +61,11 @@ 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" - repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git" - not_if { ENV["TEST_KITCHEN"] } end -wordpress_plugin "contact-form-7" do +wordpress_plugin "civicrm-admin-utilities" do site "join.osmfoundation.org" end @@ -73,7 +75,7 @@ civicrm_directory = "/srv/join.osmfoundation.org/wp-content/plugins/civicrm" directory "/opt/civicrm-#{civicrm_version}" do owner "wordpress" group "wordpress" - mode 0o755 + mode "755" end remote_file "#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip" do @@ -81,7 +83,7 @@ remote_file "#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip" do source "https://download.civicrm.org/civicrm-#{civicrm_version}-wordpress.zip" owner "wordpress" group "wordpress" - mode 0o644 + mode "644" backup false end @@ -90,26 +92,26 @@ remote_file "#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz" do source "https://download.civicrm.org/civicrm-#{civicrm_version}-l10n.tar.gz" owner "wordpress" group "wordpress" - mode 0o644 + mode "644" backup false end -execute "#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip" do +archive_file "#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip" do 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" - 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 -execute "#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz" do +archive_file "#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz" do 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" - 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 @@ -117,14 +119,14 @@ execute "/opt/civicrm-#{civicrm_version}/civicrm" do 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/plugins/files" do +directory "/srv/join.osmfoundation.org/wp-content/uploads" do owner "www-data" group "www-data" - mode 0o755 + mode "755" end extensions_directory = "/srv/join.osmfoundation.org/wp-content/plugins/civicrm-extensions" @@ -132,7 +134,7 @@ extensions_directory = "/srv/join.osmfoundation.org/wp-content/plugins/civicrm-e directory extensions_directory do owner "wordpress" group "wordpress" - mode 0o755 + mode "755" end node[:civicrm][:extensions].each_value do |details| @@ -140,7 +142,6 @@ node[:civicrm][:extensions].each_value do |details| action :sync repository details[:repository] revision details[:revision] - depth 1 user "wordpress" group "wordpress" end @@ -157,10 +158,9 @@ settings = edit_file "#{civicrm_directory}/civicrm/templates/CRM/common/civicrm. line.gsub!(/%%dbHost%%/, "localhost") line.gsub!(/%%dbName%%/, "civicrm") line.gsub!(/%%crmRoot%%/, "#{civicrm_directory}/civicrm/") - line.gsub!(/%%templateCompileDir%%/, "/srv/join.osmfoundation.org/wp-content/plugins/files/civicrm/templates_c/") + line.gsub!(/%%templateCompileDir%%/, "/srv/join.osmfoundation.org/wp-content/uploads/civicrm/templates_c/") line.gsub!(/%%baseURL%%/, "http://join.osmfoundation.org/") line.gsub!(/%%siteKey%%/, site_key) - line.gsub!(%r{// *(.*'ext_repo_url'.*)$}, "\\1") line.gsub!(%r{// *define\('CIVICRM_CMSDIR', '/path/to/install/root/'\);}, "define('CIVICRM_CMSDIR', '/srv/join.osmfoundation.org');") line @@ -169,22 +169,21 @@ end file "#{civicrm_directory}/civicrm.settings.php" do owner "wordpress" group "wordpress" - mode 0o644 + mode "644" content settings end -template "/etc/cron.d/osmf-crm" do - source "cron.erb" - owner "root" - group "root" - mode 0o600 - variables :directory => civicrm_directory, :passwords => passwords +cron_d "osmf-crm" do + minute "*/15" + 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" end template "/etc/cron.daily/osmf-crm-backup" do source "backup.cron.erb" owner "root" group "root" - mode 0o750 + mode "750" variables :passwords => passwords end