X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/abdeb8abcc779ec996fd57f0fa4978dce4565a8f..60d0de6ef253081f1197a5fed161f78685e2ca8b:/cookbooks/civicrm/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index 0a7ae17b8..f74692014 100644
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -29,6 +29,8 @@ package %w[
   php-intl
 ]
 
+apache_module "rewrite"
+
 cache_dir = Chef::Config[:file_cache_path]
 
 passwords = data_bag_item("civicrm", "passwords")
@@ -47,20 +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 aliases as this causes issues with civicrm PHP sessions
+  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
@@ -70,7 +72,12 @@ end
 
 wordpress_theme "osmblog-wp-theme" do
   site "supporting.openstreetmap.org"
-  repository "https://github.com/osmfoundation/osmblog-wp-theme.git"
+  action :delete
+end
+
+wordpress_plugin "civicrm-wp-piwik" do
+  plugin "wp-piwik"
+  site "supporting.openstreetmap.org"
 end
 
 wordpress_plugin "registration-honeypot" do
@@ -132,7 +139,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