Make the osmfoundation certificate the default cert on ridley

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

diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index 397a5815dfeb9636f0c10bc71fc3e57095658b89..5b2703fee4b9166ef27b9d9846811f686a4718c4 100644 (file)
--- a/cookbooks/switch2osm/recipes/default.rb
+++ b/cookbooks/switch2osm/recipes/default.rb
@@ -17,8 +17,6 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-node.default[:ssl][:certificates] = node[:ssl][:certificates] | ["osmfoundation"]
-

 include_recipe "wordpress"
 
 passwords = data_bag_item("switch2osm", "passwords")
 include_recipe "wordpress"
 
 passwords = data_bag_item("switch2osm", "passwords")


@@ -27,8 +25,6 @@ wordpress_site "switch2osm.org" do
   aliases ["www.switch2osm.org", "switch2osm.com", "www.switch2osm.com"]
   directory "/srv/switch2osm.org"
   ssl_enabled true
   aliases ["www.switch2osm.org", "switch2osm.com", "www.switch2osm.com"]
   directory "/srv/switch2osm.org"
   ssl_enabled true

-  ssl_certificate "osmfoundation"
-  ssl_certificate_chain "startcom"

   database_name "switch2osm-blog"
   database_user "switch2osm-user"
   database_password passwords["switch2osm-user"]
   database_name "switch2osm-blog"
   database_user "switch2osm-user"
   database_password passwords["switch2osm-user"]