Remove ssl_enabled option for wordpress sites

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

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index af1e644a8c2b901213bba016efab00e09ade2dcb..66ba6bde25769d7ed89ddb6efa6b8035e0d7c7fc 100644 (file)
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -37,7 +37,6 @@ end
 
 wordpress_site "join.osmfoundation.org" do
   aliases "crm.osmfoundation.org"
-  ssl_enabled true
   database_name "civicrm"
   database_user "civicrm"
   database_password database_password
@@ -57,6 +56,10 @@ wordpress_plugin "sitepress-multilingual-cms" do
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
+wordpress_plugin "contact-form-7" do
+  site "join.osmfoundation.org"
+end
+
 civicrm_version = node[:civicrm][:version]
 civicrm_directory = "/srv/join.osmfoundation.org/wp-content/plugins/civicrm"
 
@@ -125,7 +128,7 @@ directory extensions_directory do
   mode 0o755
 end
 
-node[:civicrm][:extensions].each do |_, details|
+node[:civicrm][:extensions].each_value do |details|
   git "#{extensions_directory}/#{details[:name]}" do
     action :sync
     repository details[:repository]