X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f9d53e7e6edee2ead816ddc414da38c62f55ab23..4901122db6d2b8b208d6659e6642593f4d2cb429:/cookbooks/civicrm/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb index 3cd6bbf61..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 @@ -94,22 +96,22 @@ remote_file "#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz" do 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,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" - 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 @@ -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