X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4bd323cb0df8e1436c5aa7878fe7ab2b97ec76b7..4a9b4158ddba295ec94e90365399562ef60453e5:/cookbooks/blog/recipes/default.rb

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index 95997cd28..e9440d75c 100644
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -24,20 +24,21 @@ passwords = data_bag_item("blog", "passwords")
 directory "/srv/blog.openstreetmap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 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"
   database_password passwords["osm-blog-user"]
   urls "/casts" => "/srv/blog.openstreetmap.org/casts",
        "/images" => "/srv/blog.openstreetmap.org/images",
-       "/news" => "/srv/blog.openstreetmap.org/news"
+       "/static" => "/srv/blog.openstreetmap.org/static"
 end
 
 wordpress_theme "osmblog-wp-theme" do
@@ -59,7 +60,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
@@ -82,6 +83,14 @@ git "/srv/blog.openstreetmap.org/images" do
   group "wordpress"
 end
 
+git "/srv/blog.openstreetmap.org/static" do
+  action :sync
+  repository "git://github.com/openstreetmap/opengeodata-static.git"
+  depth 1
+  user "wordpress"
+  group "wordpress"
+end
+
 apache_site "opengeodata.org" do
   template "opengeodata.erb"
   directory "/srv/opengeodata.org"
@@ -91,6 +100,6 @@ template "/etc/cron.daily/blog-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0750
+  mode 0o750
   variables :passwords => passwords
 end