Require postgres 9.3 on poldi and pummelzacken

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

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index e5fb6f4778bc965dff1cc7a5d99b29e4772f1094..b3bd0430c4a56e3a846fc1650c7a317f9e1b2a58 100644 (file)
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

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

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


@@ -32,6 +34,8 @@ wordpress_site "blog.openstreetmap.org" do
            "blog.openstreetmap.net", "blog.openstreetmaps.org",
            "blog.osmfoundation.org"]
   ssl_enabled true
            "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"
   directory "/srv/blog.openstreetmap.org/wp"
   database_name "osm-blog"
   database_user "osm-blog-user"