From: Tom Hughes <tom@compton.nu>
Date: Mon, 23 Feb 2015 10:48:28 +0000 (+0000)
Subject: SSL enable switch2osm and stateofthemap sites
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/afd343692a74c0b9c6fb82aeeb5f5c878ad3758e

SSL enable switch2osm and stateofthemap sites
---

diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index 6ba547914..55eb8eb36 100644
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+node.default[:ssl][:certificates] = node[:ssl][:certificates] | ["osmfoundation"]
+
 include_recipe "wordpress"
 
 passwords = data_bag_item("stateofthemap", "passwords")
@@ -30,6 +32,9 @@ end
 wordpress_site "2007.stateofthemap.org" do
   aliases "2007.stateofthemap.com"
   directory "/srv/2007.stateofthemap.org/wp"
+  ssl_enabled true
+  ssl_certificate "osmfoundation"
+  ssl_certificate_chain "startcom"
   database_name "sotm2007"
   database_user "sotm2007"
   database_password passwords["sotm2007"]
@@ -60,6 +65,9 @@ end
 wordpress_site "2008.stateofthemap.org" do
   aliases "2008.stateofthemap.com"
   directory "/srv/2008.stateofthemap.org/wp"
+  ssl_enabled true
+  ssl_certificate "osmfoundation"
+  ssl_certificate_chain "startcom"
   database_name "sotm2008"
   database_user "sotm2008"
   database_password passwords["sotm2008"]
@@ -93,6 +101,9 @@ end
 wordpress_site "2009.stateofthemap.org" do
   aliases "2009.stateofthemap.com"
   directory "/srv/2009.stateofthemap.org/wp"
+  ssl_enabled true
+  ssl_certificate "osmfoundation"
+  ssl_certificate_chain "startcom"
   database_name "sotm2009"
   database_user "sotm2009"
   database_password passwords["sotm2009"]
@@ -128,6 +139,9 @@ end
 wordpress_site "2010.stateofthemap.org" do
   aliases "2010.stateofthemap.com"
   directory "/srv/2010.stateofthemap.org/wp"
+  ssl_enabled true
+  ssl_certificate "osmfoundation"
+  ssl_certificate_chain "startcom"
   database_name "sotm2010"
   database_user "sotm2010"
   database_password passwords["sotm2010"]
@@ -166,6 +180,9 @@ end
 wordpress_site "2011.stateofthemap.org" do
   aliases "2011.stateofthemap.com"
   directory "/srv/2011.stateofthemap.org/wp"
+  ssl_enabled true
+  ssl_certificate "osmfoundation"
+  ssl_certificate_chain "startcom"
   database_name "sotm2011"
   database_user "sotm2011"
   database_password passwords["sotm2011"]
@@ -204,6 +221,9 @@ end
 wordpress_site "2012.stateofthemap.org" do
   aliases "2012.stateofthemap.com"
   directory "/srv/2012.stateofthemap.org/wp"
+  ssl_enabled true
+  ssl_certificate "osmfoundation"
+  ssl_certificate_chain "startcom"
   database_name "sotm2012"
   database_user "sotm2012"
   database_password passwords["sotm2012"]
diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index 45eb7f03e..397a5815d 100644
--- a/cookbooks/switch2osm/recipes/default.rb
+++ b/cookbooks/switch2osm/recipes/default.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+node.default[:ssl][:certificates] = node[:ssl][:certificates] | ["osmfoundation"]
+
 include_recipe "wordpress"
 
 passwords = data_bag_item("switch2osm", "passwords")
@@ -24,6 +26,9 @@ passwords = data_bag_item("switch2osm", "passwords")
 wordpress_site "switch2osm.org" do
   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"]