From: Tom Hughes <tom@compton.nu>
Date: Mon, 24 Mar 2014 10:27:57 +0000 (+0000)
Subject: Fixup civicrm settings
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/ac5bccf32f094c56b17152774719ffb07be1d90c?hp=bfff0526c5efe1ed1afea101806b3ade1cdf1f5b

Fixup civicrm settings
---

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index 27875bead..fc3c77e91 100644
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -111,15 +111,15 @@ settings = edit_file "#{civicrm_directory}/civicrm/templates/CRM/common/civicrm.
   line.gsub!(/%%dbPass%%/, database_password)
   line.gsub!(/%%dbHost%%/, "localhost")
   line.gsub!(/%%dbName%%/, "civicrm")
-  line.gsub!(/%%crmRoot%%/, "#{civicrm_directory}/civicrm")
-  line.gsub!(/%%templateCompileDir%%/, "/srv/crm.osmfoundation.org/wp-content/plugins/files/civicrm/templates_c")
+  line.gsub!(/%%crmRoot%%/, "#{civicrm_directory}/civicrm/")
+  line.gsub!(/%%templateCompileDir%%/, "/srv/crm.osmfoundation.org/wp-content/plugins/files/civicrm/templates_c/")
   line.gsub!(/%%baseURL%%/, "http://crm.osmfoundation.org/")
   line.gsub!(/%%siteKey%%/, site_key)
 
   line
 end
 
-file "#{civicrm_directory}/civicrm/civicrm.settings.php" do
+file "#{civicrm_directory}/civicrm.settings.php" do
   owner "wordpress"
   group "wordpress"
   mode 0644