Configure cred_keys and sign_keys for civicrm

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index 5d0736e8b9e24f8cf64b5a86416029de1c49978d..89ba93a42b060cbb75fbb19d5e559d1227c94c0b 100644 (file)
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -34,7 +34,9 @@ cache_dir = Chef::Config[:file_cache_path]
 passwords = data_bag_item("civicrm", "passwords")
 
 database_password = passwords["database"]
 passwords = data_bag_item("civicrm", "passwords")
 
 database_password = passwords["database"]

-site_key = passwords["key"]
+site_key = passwords["site_key"]
+cred_keys = passwords["cred_keys"]
+sign_keys = passwords["sign_keys"]

 
 mysql_user "civicrm@localhost" do
   password database_password
 
 mysql_user "civicrm@localhost" do
   password database_password


@@ -161,6 +163,8 @@ settings = edit_file "#{civicrm_directory}/civicrm/templates/CRM/common/civicrm.
   line.gsub!(/%%templateCompileDir%%/, "/srv/join.osmfoundation.org/wp-content/uploads/civicrm/templates_c/")
   line.gsub!(/%%baseURL%%/, "http://join.osmfoundation.org/")
   line.gsub!(/%%siteKey%%/, site_key)
   line.gsub!(/%%templateCompileDir%%/, "/srv/join.osmfoundation.org/wp-content/uploads/civicrm/templates_c/")
   line.gsub!(/%%baseURL%%/, "http://join.osmfoundation.org/")
   line.gsub!(/%%siteKey%%/, site_key)

+  line.gsub!(/%%credKeys%%/, cred_keys)
+  line.gsub!(/%%signKeys%%/, sign_keys)

   line.gsub!(%r{// *define\('CIVICRM_CMSDIR', '/path/to/install/root/'\);}, "define('CIVICRM_CMSDIR', '/srv/join.osmfoundation.org');")
 
   line
   line.gsub!(%r{// *define\('CIVICRM_CMSDIR', '/path/to/install/root/'\);}, "define('CIVICRM_CMSDIR', '/srv/join.osmfoundation.org');")
 
   line

diff --git a/test/data_bags/civicrm/passwords.json b/test/data_bags/civicrm/passwords.json
index fda558dd5f0946b3b482819ddc45b5a08ee67399..bcd1ad40971ef5e1a129b5215f71f80f81fe79ad 100644 (file)
--- a/test/data_bags/civicrm/passwords.json
+++ b/test/data_bags/civicrm/passwords.json
@@ -2,6 +2,8 @@
   "id": "passwords",
   "database": "database-password",
   "admin": "admin-password",
   "id": "passwords",
   "database": "database-password",
   "admin": "admin-password",

-  "key": "key",
+  "site_key": "site_key",
+  "cred_keys": "cred_keys",
+  "sign_keys": "sign_keys",

   "batch": "batch"
 }
   "batch": "batch"
 }