X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6d1b6ef2ac6ab5f8df648544a7200fa35e13343e..344788757d5720c1910a441e7d2b33aa57fb2dbe:/cookbooks/stateofthemap/recipes/wordpress.rb?ds=sidebyside

diff --git a/cookbooks/stateofthemap/recipes/wordpress.rb b/cookbooks/stateofthemap/recipes/wordpress.rb
index 87366e7d9..61f22c145 100644
--- a/cookbooks/stateofthemap/recipes/wordpress.rb
+++ b/cookbooks/stateofthemap/recipes/wordpress.rb
@@ -21,7 +21,7 @@ include_recipe "stateofthemap"
 include_recipe "wordpress"
 
 passwords = data_bag_item("stateofthemap", "passwords")
-wp2fa_encrypt_keys = data_bag_item("blog", "wp2fa_encrypt_keys")
+wp2fa_encrypt_keys = data_bag_item("stateofthemap", "wp2fa_encrypt_keys")
 
 directory "/srv/2007.stateofthemap.org" do
   owner "wordpress"
@@ -30,7 +30,7 @@ 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"
@@ -47,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"
@@ -59,7 +61,7 @@ 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"
@@ -76,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"
@@ -97,7 +101,7 @@ 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"
@@ -137,7 +141,7 @@ 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"
@@ -183,7 +187,7 @@ 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"
@@ -229,7 +233,7 @@ 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"