X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/68e068818d559ef35bdf2a138a93596337828ef9..22df041f3f3b96c099322ddb344f32d689fff943:/cookbooks/blog/recipes/default.rb?ds=inline diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb index 46b6902ad..5a876d8a6 100644 --- a/cookbooks/blog/recipes/default.rb +++ b/cookbooks/blog/recipes/default.rb @@ -20,6 +20,7 @@ include_recipe "wordpress" passwords = data_bag_item("blog", "passwords") +wp2fa_encrypt_keys = data_bag_item("blog", "wp2fa_encrypt_keys") directory "/srv/blog.openstreetmap.org" do owner "wordpress" @@ -30,11 +31,15 @@ end wordpress_site "blog.openstreetmap.org" do aliases ["blog.osm.org", "blog.openstreetmap.com", "blog.openstreetmap.net", "blog.openstreetmaps.org", - "blog.osmfoundation.org"] + "blog.osmfoundation.org", + "opengeodata.org", "www.opengeodata.org", + "old.opengeodata.org" # https://blog.openstreetmap.org/2010/02/25/old-opengeodata-posts-now-up-at-old-opengeodata-org/ + ] directory "/srv/blog.openstreetmap.org/wp" database_name "osm-blog" database_user "osm-blog-user" database_password passwords["osm-blog-user"] + wp2fa_encrypt_key wp2fa_encrypt_keys["key"] urls "/casts" => "/srv/blog.openstreetmap.org/casts", "/images" => "/srv/blog.openstreetmap.org/images", "/static" => "/srv/blog.openstreetmap.org/static" @@ -97,6 +102,7 @@ end git "/srv/blog.openstreetmap.org/casts" do action :sync repository "https://github.com/openstreetmap/opengeodata-podcasts.git" + revision "master" depth 1 user "wordpress" group "wordpress" @@ -105,6 +111,7 @@ end git "/srv/blog.openstreetmap.org/images" do action :sync repository "https://github.com/openstreetmap/opengeodata-images.git" + revision "master" depth 1 user "wordpress" group "wordpress" @@ -113,21 +120,12 @@ end git "/srv/blog.openstreetmap.org/static" do action :sync repository "https://github.com/openstreetmap/opengeodata-static.git" + revision "master" depth 1 user "wordpress" group "wordpress" end -ssl_certificate "opengeodata.org" do - domains ["opengeodata.org", "www.opengeodata.org", "old.opengeodata.org"] - notifies :reload, "service[apache2]" -end - -apache_site "opengeodata.org" do - template "opengeodata.erb" - directory "/srv/opengeodata.org" -end - template "/etc/cron.daily/blog-backup" do source "backup.cron.erb" owner "root"