X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e228a690bd4e3cc25e354235294e065fd59a8e02..462ac9b55aee40da858bcf4689353a64aeced924:/cookbooks/civicrm/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb index f21f5fc6d..2aed4f64f 100644 --- a/cookbooks/civicrm/recipes/default.rb +++ b/cookbooks/civicrm/recipes/default.rb @@ -49,21 +49,20 @@ mysql_database "civicrm" do permissions "civicrm@localhost" => :all end -ssl_certificate "join.osmfoundation.org" do - domains [ "join.osmfoundation.org", "crm.osmfoundation.org", - "supporting.osmfoundation.org", "support.osmfoundation.org", - "support.openstreetmap.org", "supporting.osm.org", - "support.osm.org"] - notifies :reload, "service[apache2]" -end - -apache_site "join.osmfoundation.org" do - template "apache.erb" -end - wordpress_site "supporting.openstreetmap.org" do - # Do not add extra aliases as this causes issues with civicrm PHP sessions - aliases ["supporting.openstreetmap.org"] + aliases %w[ + crm.osmfoundation.org + donate.openstreetmap.org + donate.openstreetmap.com + donate.openstreetmap.net + donate.osm.org + join.osmfoundation.org + supporting.osmfoundation.org + support.osmfoundation.org + support.openstreetmap.org + supporting.osm.org + support.osm.org + ] database_name "civicrm" database_user "civicrm" database_password database_password @@ -71,9 +70,9 @@ wordpress_site "supporting.openstreetmap.org" do fpm_prometheus_port 11301 end -wordpress_theme "osmblog-wp-theme" do +wordpress_plugin "civicrm-wp-piwik" do + plugin "wp-piwik" site "supporting.openstreetmap.org" - repository "https://github.com/osmfoundation/osmblog-wp-theme.git" end wordpress_plugin "registration-honeypot" do @@ -88,6 +87,20 @@ wordpress_plugin "civicrm-admin-utilities" do site "supporting.openstreetmap.org" end +wordpress_plugin "host-webfonts-local" do + site "supporting.openstreetmap.org" +end + +wordpress_theme "morden" do + site "supporting.openstreetmap.org" + repository "https://public-api.wordpress.com/rest/v1/themes/download/morden.zip" +end + +wordpress_theme "varia" do + site "supporting.openstreetmap.org" + repository "https://public-api.wordpress.com/rest/v1/themes/download/varia.zip" +end + civicrm_version = node[:civicrm][:version] civicrm_directory = "/srv/supporting.openstreetmap.org/wp-content/plugins/civicrm" @@ -135,7 +148,7 @@ end execute "/opt/civicrm-#{civicrm_version}/civicrm" do action :nothing - command "rsync --archive --delete /opt/civicrm-#{civicrm_version}/civicrm/ #{civicrm_directory}" + command "rsync --archive --delete --delete-delay --delay-updates /opt/civicrm-#{civicrm_version}/civicrm/ #{civicrm_directory}" user "wordpress" group "wordpress" subscribes :run, "archive_file[#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip]", :immediately @@ -157,12 +170,32 @@ directory extensions_directory do end node[:civicrm][:extensions].each_value do |details| - git "#{extensions_directory}/#{details[:name]}" do - action :sync - repository details[:repository] - revision details[:revision] - user "wordpress" - group "wordpress" + if details[:repository] + git "#{extensions_directory}/#{details[:name]}" do + action :sync + repository details[:repository] + revision details[:revision] + user "wordpress" + group "wordpress" + end + elsif details[:zip] + remote_file "#{cache_dir}/#{details[:name]}.zip" do + source details[:zip] + owner "root" + group "root" + mode "644" + backup false + end + + archive_file "#{cache_dir}/#{details[:name]}.zip" do + action :nothing + destination "#{extensions_directory}/#{details[:name]}" + strip_components 1 + owner "wordpress" + group "wordpress" + overwrite true + subscribes :extract, "remote_file[#{cache_dir}/#{details[:name]}.zip]", :immediately + end end end @@ -183,17 +216,29 @@ settings = edit_file "#{civicrm_directory}/civicrm/templates/CRM/common/civicrm. line.gsub!(/%%credKeys%%/, cred_keys) line.gsub!(/%%signKeys%%/, sign_keys) line.gsub!(%r{// *define\('CIVICRM_CMSDIR', '/path/to/install/root/'\);}, "define('CIVICRM_CMSDIR', '/srv/supporting.openstreetmap.org');") + # Don't recompile smarty templates on every call https://docs.civicrm.org/sysadmin/en/latest/setup/optimizations/#disable-compile-check + line.gsub!(%r{// define\('CIVICRM_TEMPLATE_COMPILE_CHECK', FALSE\);}, "define('CIVICRM_TEMPLATE_COMPILE_CHECK', FALSE);") line end -file "#{civicrm_directory}/civicrm.settings.php" do +directory "/srv/supporting.openstreetmap.org/wp-content/uploads/civicrm" do + owner "www-data" + group "www-data" + mode "755" +end + +file "/srv/supporting.openstreetmap.org/wp-content/uploads/civicrm/civicrm.settings.php" do owner "wordpress" group "wordpress" mode "644" content settings end +file "#{civicrm_directory}/civicrm.settings.php" do + action :delete +end + systemd_service "osmf-crm-jobs" do description "Run CRM jobs" exec_start "/usr/bin/php #{civicrm_directory}/civicrm/bin/cli.php -s supporting.openstreetmap.org -u batch -p \"#{passwords['batch']}\" -e Job -a execute"