X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ab705bd5800222be6c91d5ff899069a19ba0ef69..1093079fd9c52d5c97f43045802ee6f149f5b4e8:/cookbooks/civicrm/recipes/default.rb

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index 16947c9ef..c153c373f 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")
@@ -60,8 +62,8 @@ apache_site "join.osmfoundation.org" do
 end
 
 wordpress_site "supporting.openstreetmap.org" do
-  # Do not add extra aliases as this causes issues with civicrm PHP sessions
-  aliases ["supporting.openstreetmap.org"]
+  # Do not add aliases these can causes issues with civicrm PHP sessions
+  # Use redirects instead
   database_name "civicrm"
   database_user "civicrm"
   database_password database_password
@@ -133,7 +135,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