Use osmfoundation certificate for the blog

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

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index 95997cd2893ee030f1b9e203bcc999d2c0de96d0..b3bd0430c4a56e3a846fc1650c7a317f9e1b2a58 100644 (file)
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/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("blog", "passwords")
@@ -28,9 +30,12 @@ directory "/srv/blog.openstreetmap.org" do
 end
 
 wordpress_site "blog.openstreetmap.org" do
-  aliases "blog.osm.org", "blog.openstreetmap.com",
-          "blog.openstreetmap.net", "blog.openstreetmaps.org",
-          "blog.osmfoundation.org"
+  aliases ["blog.osm.org", "blog.openstreetmap.com",
+           "blog.openstreetmap.net", "blog.openstreetmaps.org",
+           "blog.osmfoundation.org"]
+  ssl_enabled true
+  ssl_certificate "osmfoundation"
+  ssl_certificate_chain "startcom"
   directory "/srv/blog.openstreetmap.org/wp"
   database_name "osm-blog"
   database_user "osm-blog-user"
@@ -59,7 +64,7 @@ end
 
 wordpress_plugin "sitepress-multilingual-cms" do
   site "blog.openstreetmap.org"
-  source "plugins/sitepress-multilingual-cms"
+  repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
 wordpress_plugin "wordpress-importer" do