X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8903a330b8556b982356ef80622b0f7a04253b58..a9a6340f48df36525008416dc65cd76a1d700821:/cookbooks/civicrm/recipes/default.rb

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index dccb46a50..2aed4f64f 100644
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -217,20 +217,28 @@ settings = edit_file "#{civicrm_directory}/civicrm/templates/CRM/common/civicrm.
   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);")
-  # Upgrade smarty 2 to smarty 4
-  line.gsub!(%r{if \(strpos\(CIVICRM_UF_BASEURL, 'localhost'\) !== FALSE \|\| strpos\(CIVICRM_UF_BASEURL, 'demo\.civicrm\.org'\) !== FALSE\) \{}, "if (true) {")
+  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"