From 29ce9be3bb415ccfbee5505702fd515a55096c32 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Wed, 18 Sep 2024 00:39:10 +0100 Subject: [PATCH 1/1] Switch SoTM 2009 to container --- cookbooks/stateofthemap/recipes/container.rb | 2 +- cookbooks/stateofthemap/recipes/wordpress.rb | 40 -------------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/cookbooks/stateofthemap/recipes/container.rb b/cookbooks/stateofthemap/recipes/container.rb index f7152bb61..3b5bd38b9 100644 --- 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 -%w[2007 2008 2013 2016 2017 2018 2019 2020 2021 2022 2024].each do |year| +%w[2007 2008 2009 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"] diff --git a/cookbooks/stateofthemap/recipes/wordpress.rb b/cookbooks/stateofthemap/recipes/wordpress.rb index a34f85024..bd659f682 100644 --- a/cookbooks/stateofthemap/recipes/wordpress.rb +++ b/cookbooks/stateofthemap/recipes/wordpress.rb @@ -23,46 +23,6 @@ include_recipe "wordpress" passwords = data_bag_item("stateofthemap", "passwords") wp2fa_encrypt_keys = data_bag_item("stateofthemap", "wp2fa_encrypt_keys") -directory "/srv/2009.stateofthemap.org" do - owner "wordpress" - group "wordpress" - mode "755" -end - -git "/srv/2009.stateofthemap.org" do - action :sync - repository "https://git.openstreetmap.org/public/stateofthemap.git" - revision "resources-2009" - depth 1 - user "wordpress" - group "wordpress" -end - -wordpress_site "2009.stateofthemap.org" do - 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" - fpm_prometheus_port 12009 -end - -wordpress_theme "2009.stateofthemap.org-aerodrome" do - theme "aerodrome" - site "2009.stateofthemap.org" - repository "https://git.openstreetmap.org/public/stateofthemap.git" - revision "theme-2009" -end - -# wordpress_plugin "2009.stateofthemap.org-wp-sticky" do -# plugin "wp-sticky" -# site "2009.stateofthemap.org" -# end - directory "/srv/2010.stateofthemap.org" do owner "wordpress" group "wordpress" -- 2.39.5