X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2dda97888557e215bae8daeae951c4873f1859d6..a8930abf977175e1034465cb4e93d4d3673e366c:/cookbooks/stateofthemap/recipes/wordpress.rb

diff --git a/cookbooks/stateofthemap/recipes/wordpress.rb b/cookbooks/stateofthemap/recipes/wordpress.rb
index 75b0e34a9..61f22c145 100644
--- a/cookbooks/stateofthemap/recipes/wordpress.rb
+++ b/cookbooks/stateofthemap/recipes/wordpress.rb
@@ -21,6 +21,7 @@ include_recipe "stateofthemap"
 include_recipe "wordpress"
 
 passwords = data_bag_item("stateofthemap", "passwords")
+wp2fa_encrypt_keys = data_bag_item("stateofthemap", "wp2fa_encrypt_keys")
 
 directory "/srv/2007.stateofthemap.org" do
   owner "wordpress"
@@ -29,12 +30,13 @@ directory "/srv/2007.stateofthemap.org" do
 end
 
 wordpress_site "2007.stateofthemap.org" do
-  aliases "2007.stateofthemap.com"
+  aliases ["2007.stateofthemap.com", "2007.sotm.org"]
   directory "/srv/2007.stateofthemap.org/wp"
   database_name "sotm2007"
   database_user "sotm2007"
   database_password passwords["sotm2007"]
   database_prefix "wp_sotm_"
+  wp2fa_encrypt_key wp2fa_encrypt_keys["sotm2007"]
   fpm_prometheus_port 12007
 end
 
@@ -45,10 +47,12 @@ wordpress_theme "2007.stateofthemap.org-refreshwp-11" do
   revision "theme-2007"
 end
 
-# wordpress_plugin "2007.stateofthemap.org-geopress" do
-#   plugin "geopress"
-#   site "2007.stateofthemap.org"
-# end
+# Remove broken geopress plugin
+wordpress_plugin "2007.stateofthemap.org-geopress" do
+  action :delete
+  plugin "geopress"
+  site "2007.stateofthemap.org"
+end
 
 directory "/srv/2008.stateofthemap.org" do
   owner "wordpress"
@@ -57,12 +61,13 @@ directory "/srv/2008.stateofthemap.org" do
 end
 
 wordpress_site "2008.stateofthemap.org" do
-  aliases "2008.stateofthemap.com"
+  aliases ["2008.stateofthemap.com", "2008.sotm.org"]
   directory "/srv/2008.stateofthemap.org/wp"
   database_name "sotm2008"
   database_user "sotm2008"
   database_password passwords["sotm2008"]
   database_prefix "wp_sotm08_"
+  wp2fa_encrypt_key wp2fa_encrypt_keys["sotm2008"]
   fpm_prometheus_port 12008
 end
 
@@ -73,10 +78,12 @@ wordpress_theme "2008.stateofthemap.org-refreshwp-11" do
   revision "theme-2008"
 end
 
-# wordpress_plugin "2008.stateofthemap.org-geopress" do
-#   plugin "geopress"
-#   site "2008.stateofthemap.org"
-# end
+# Remove broken geopress plugin
+wordpress_plugin "2008.stateofthemap.org-geopress" do
+  action :delete
+  plugin "geopress"
+  site "2008.stateofthemap.org"
+end
 
 directory "/srv/2009.stateofthemap.org" do
   owner "wordpress"
@@ -94,11 +101,12 @@ git "/srv/2009.stateofthemap.org" do
 end
 
 wordpress_site "2009.stateofthemap.org" do
-  aliases "2009.stateofthemap.com"
+  aliases ["2009.stateofthemap.com", "2009.sotm.org"]
   directory "/srv/2009.stateofthemap.org/wp"
   database_name "sotm2009"
   database_user "sotm2009"
   database_password passwords["sotm2009"]
+  wp2fa_encrypt_key wp2fa_encrypt_keys["sotm2009"]
   urls "/register" => "/srv/2009.stateofthemap.org/register",
        "/register-pro-user" => "/srv/2009.stateofthemap.org/register-pro-user",
        "/podcasts" => "/srv/2009.stateofthemap.org/podcasts"
@@ -133,11 +141,12 @@ git "/srv/2010.stateofthemap.org" do
 end
 
 wordpress_site "2010.stateofthemap.org" do
-  aliases "2010.stateofthemap.com"
+  aliases ["2010.stateofthemap.com", "2010.sotm.org"]
   directory "/srv/2010.stateofthemap.org/wp"
   database_name "sotm2010"
   database_user "sotm2010"
   database_password passwords["sotm2010"]
+  wp2fa_encrypt_key wp2fa_encrypt_keys["sotm2010"]
   urls "/register" => "/srv/2010.stateofthemap.org/register"
   fpm_prometheus_port 12010
 end
@@ -178,11 +187,12 @@ git "/srv/2011.stateofthemap.org" do
 end
 
 wordpress_site "2011.stateofthemap.org" do
-  aliases "2011.stateofthemap.com"
+  aliases ["2011.stateofthemap.com", "2011.sotm.org"]
   directory "/srv/2011.stateofthemap.org/wp"
   database_name "sotm2011"
   database_user "sotm2011"
   database_password passwords["sotm2011"]
+  wp2fa_encrypt_key wp2fa_encrypt_keys["sotm2011"]
   urls "/register" => "/srv/2011.stateofthemap.org/register"
   fpm_prometheus_port 12011
 end
@@ -223,11 +233,12 @@ git "/srv/2012.stateofthemap.org" do
 end
 
 wordpress_site "2012.stateofthemap.org" do
-  aliases "2012.stateofthemap.com"
+  aliases ["2012.stateofthemap.com", "2012.sotm.org"]
   directory "/srv/2012.stateofthemap.org/wp"
   database_name "sotm2012"
   database_user "sotm2012"
   database_password passwords["sotm2012"]
+  wp2fa_encrypt_key wp2fa_encrypt_keys["sotm2012"]
   urls "/register" => "/srv/2012.stateofthemap.org/register"
   fpm_prometheus_port 12012
 end