mediawiki: Fix ReCaptcha key variable names

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

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index 95997cd2893ee030f1b9e203bcc999d2c0de96d0..02479580b02ee5fd481576366037b25acfc6eb7b 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")


@@ -24,13 +26,16 @@ passwords = data_bag_item("blog", "passwords")
 directory "/srv/blog.openstreetmap.org" do
   owner "wordpress"
   group "wordpress"
 directory "/srv/blog.openstreetmap.org" do
   owner "wordpress"
   group "wordpress"

-  mode 0755
+  mode 0o755

 end
 
 wordpress_site "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"
   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"
 
 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
 end
 
 wordpress_plugin "wordpress-importer" do


@@ -91,6 +96,6 @@ template "/etc/cron.daily/blog-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
   source "backup.cron.erb"
   owner "root"
   group "root"

-  mode 0750
+  mode 0o750

   variables :passwords => passwords
 end
   variables :passwords => passwords
 end