Revert "Move AMS gateway to tabaluga"

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

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index 820731a497b44dba6d9e641f1a5b17597f7fc408..5a876d8a6b16878924abf1d2426221071bb50c97 100644 (file)
--- 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")
 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"
 
 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",
 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"]
   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"
   urls "/casts" => "/srv/blog.openstreetmap.org/casts",
        "/images" => "/srv/blog.openstreetmap.org/images",
        "/static" => "/srv/blog.openstreetmap.org/static"


@@ -44,10 +49,11 @@ end
 wordpress_theme "blog.openstreetmap.org-osmblog-wp-theme" do
   theme "osmblog-wp-theme"
   site "blog.openstreetmap.org"
 wordpress_theme "blog.openstreetmap.org-osmblog-wp-theme" do
   theme "osmblog-wp-theme"
   site "blog.openstreetmap.org"

-  repository "https://github.com/harry-wood/osmblog-wp-theme.git"
+  repository "https://github.com/osmfoundation/osmblog-wp-theme.git"

 end
 
 wordpress_plugin "blog.openstreetmap.org-google-analytics-for-wordpress" do
 end
 
 wordpress_plugin "blog.openstreetmap.org-google-analytics-for-wordpress" do

+  action :delete

   plugin "google-analytics-for-wordpress"
   site "blog.openstreetmap.org"
 end
   plugin "google-analytics-for-wordpress"
   site "blog.openstreetmap.org"
 end


@@ -64,10 +70,16 @@ end
 # end
 
 wordpress_plugin "blog.openstreetmap.org-shareadraft" do
 # end
 
 wordpress_plugin "blog.openstreetmap.org-shareadraft" do

+  action :delete

   plugin "shareadraft"
   site "blog.openstreetmap.org"
 end
 
   plugin "shareadraft"
   site "blog.openstreetmap.org"
 end
 

+wordpress_plugin "blog.openstreetmap.org-public-post-preview" do
+  plugin "public-post-preview"
+  site "blog.openstreetmap.org"
+end
+

 wordpress_plugin "blog.openstreetmap.org-sitepress-multilingual-cms" do
   plugin "sitepress-multilingual-cms"
   site "blog.openstreetmap.org"
 wordpress_plugin "blog.openstreetmap.org-sitepress-multilingual-cms" do
   plugin "sitepress-multilingual-cms"
   site "blog.openstreetmap.org"


@@ -77,6 +89,7 @@ wordpress_plugin "blog.openstreetmap.org-sitepress-multilingual-cms" do
 end
 
 wordpress_plugin "blog.openstreetmap.org-wordpress-importer" do
 end
 
 wordpress_plugin "blog.openstreetmap.org-wordpress-importer" do

+  action :delete

   plugin "wordpress-importer"
   site "blog.openstreetmap.org"
 end
   plugin "wordpress-importer"
   site "blog.openstreetmap.org"
 end


@@ -89,6 +102,7 @@ end
 git "/srv/blog.openstreetmap.org/casts" do
   action :sync
   repository "https://github.com/openstreetmap/opengeodata-podcasts.git"
 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"
   depth 1
   user "wordpress"
   group "wordpress"


@@ -97,6 +111,7 @@ end
 git "/srv/blog.openstreetmap.org/images" do
   action :sync
   repository "https://github.com/openstreetmap/opengeodata-images.git"
 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"
   depth 1
   user "wordpress"
   group "wordpress"


@@ -105,21 +120,12 @@ end
 git "/srv/blog.openstreetmap.org/static" do
   action :sync
   repository "https://github.com/openstreetmap/opengeodata-static.git"
 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
 
   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"
 template "/etc/cron.daily/blog-backup" do
   source "backup.cron.erb"
   owner "root"