X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4bd323cb0df8e1436c5aa7878fe7ab2b97ec76b7..7dc52ddeb2479043554aa05956b472e8c8098150:/cookbooks/blog/recipes/default.rb diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb index 95997cd28..02479580b 100644 --- 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") @@ -24,13 +26,16 @@ 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 + 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 @@ -91,6 +96,6 @@ template "/etc/cron.daily/blog-backup" do source "backup.cron.erb" owner "root" group "root" - mode 0750 + mode 0o750 variables :passwords => passwords end