Switch SoTM 2007 and 2008 to containers

diff --git a/cookbooks/stateofthemap/recipes/container.rb b/cookbooks/stateofthemap/recipes/container.rb
index 16cb780ece1e41abd74a9db2f8dedce6720bde91..f7152bb61de7f780ed904e0816b4076889498784 100644 (file)
--- a/cookbooks/stateofthemap/recipes/container.rb
+++ b/cookbooks/stateofthemap/recipes/container.rb
@@ -24,7 +24,7 @@ podman_site "stateofthemap.org" do
   aliases ["www.stateofthemap.org", "stateofthemap.com", "www.stateofthemap.com", "sotm.org", "www.sotm.org"]
 end
 
   aliases ["www.stateofthemap.org", "stateofthemap.com", "www.stateofthemap.com", "sotm.org", "www.sotm.org"]
 end
 

-%w[2013 2016 2017 2018 2019 2020 2021 2022 2024].each do |year|
+%w[2007 2008 2013 2016 2017 2018 2019 2020 2021 2022 2024].each do |year|

   podman_site "#{year}.stateofthemap.org" do
     image "ghcr.io/openstreetmap/stateofthemap-#{year}:latest"
     aliases ["#{year}.stateofthemap.com", "#{year}.sotm.org"]
   podman_site "#{year}.stateofthemap.org" do
     image "ghcr.io/openstreetmap/stateofthemap-#{year}:latest"
     aliases ["#{year}.stateofthemap.com", "#{year}.sotm.org"]

diff --git a/cookbooks/stateofthemap/recipes/wordpress.rb b/cookbooks/stateofthemap/recipes/wordpress.rb
index 61f22c1456730443e291b3b489f947f82d1f61cd..a34f850242df288d4801b6a6b270ebb41683d071 100644 (file)
--- a/cookbooks/stateofthemap/recipes/wordpress.rb
+++ b/cookbooks/stateofthemap/recipes/wordpress.rb
@@ -23,68 +23,6 @@ include_recipe "wordpress"
 passwords = data_bag_item("stateofthemap", "passwords")
 wp2fa_encrypt_keys = data_bag_item("stateofthemap", "wp2fa_encrypt_keys")
 
 passwords = data_bag_item("stateofthemap", "passwords")
 wp2fa_encrypt_keys = data_bag_item("stateofthemap", "wp2fa_encrypt_keys")
 

-directory "/srv/2007.stateofthemap.org" do
-  owner "wordpress"
-  group "wordpress"
-  mode "755"
-end
-
-wordpress_site "2007.stateofthemap.org" do
-  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
-
-wordpress_theme "2007.stateofthemap.org-refreshwp-11" do
-  theme "refreshwp-11"
-  site "2007.stateofthemap.org"
-  repository "https://git.openstreetmap.org/public/stateofthemap.git"
-  revision "theme-2007"
-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"
-  group "wordpress"
-  mode "755"
-end
-
-wordpress_site "2008.stateofthemap.org" do
-  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
-
-wordpress_theme "2008.stateofthemap.org-refreshwp-11" do
-  theme "refreshwp-11"
-  site "2008.stateofthemap.org"
-  repository "https://git.openstreetmap.org/public/stateofthemap.git"
-  revision "theme-2008"
-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"
   group "wordpress"
 directory "/srv/2009.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"