X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/93088ecf5f09c8d7383fccd4aa06fcf44cb4691a..891d124699c14c4b91f8924d06dd2af8697e6e87:/cookbooks/blog/recipes/default.rb diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb index 41970b977..33e34dbb7 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,13 @@ 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" @@ -92,6 +94,6 @@ template "/etc/cron.daily/blog-backup" do source "backup.cron.erb" owner "root" group "root" - mode 0750 + mode 0o750 variables :passwords => passwords end