Update SSL certificates

[chef.git] / cookbooks / civicrm / recipes / default.rb

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index 382cb53b442b78b35a464054871a1e4e0e8da2ad..dcb67acdc811a94963186f2ed90531691ce3e202 100644 (file)
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ "crm.osmfoundation" ]
+node.default[:ssl][:certificates] = node[:ssl][:certificates] | ["osmfoundation"]
 
 include_recipe "wordpress"
 include_recipe "mysql"
@@ -27,7 +27,6 @@ package "wkhtmltopdf"
 passwords = data_bag_item("civicrm", "passwords")
 
 database_password = passwords["database"]
-admin_password = passwords["admin"]
 site_key = passwords["key"]
 
 mysql_user "civicrm@localhost" do
@@ -40,7 +39,7 @@ end
 
 wordpress_site "crm.osmfoundation.org" do
   ssl_enabled true
-  ssl_certificate "crm.osmfoundation"
+  ssl_certificate "osmfoundation"
   database_name "civicrm"
   database_user "civicrm"
   database_password database_password