Remove a couple of requests for legacy certificates

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

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index 3a363bc02c99a584c127750af5d9311a942061f2..082c34bf929b7ebc4ab481f97dee29cb6aecf514 100644 (file)
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -24,13 +24,14 @@ 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

   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 +60,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


@@ -86,3 +87,11 @@ apache_site "opengeodata.org" do
   template "opengeodata.erb"
   directory "/srv/opengeodata.org"
 end
   template "opengeodata.erb"
   directory "/srv/opengeodata.org"
 end

+
+template "/etc/cron.daily/blog-backup" do
+  source "backup.cron.erb"
+  owner "root"
+  group "root"
+  mode 0o750
+  variables :passwords => passwords
+end