X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/74483151199f92c43e6e3c70e2d64535b2ea84b0..1bc8da5f3a3bfd6c3f0ba374f12d489d13831460:/cookbooks/stateofthemap/recipes/container.rb?ds=inline diff --git a/cookbooks/stateofthemap/recipes/container.rb b/cookbooks/stateofthemap/recipes/container.rb index 6320e81ee..3b5bd38b9 100644 --- a/cookbooks/stateofthemap/recipes/container.rb +++ b/cookbooks/stateofthemap/recipes/container.rb @@ -17,27 +17,16 @@ # limitations under the License. # -include_recipe "apache" -include_recipe "podman" +include_recipe "podman::apache" -apache_module "proxy_http" - -%w[2013 2016 2017 2018 2019 2020 2021 2022].each do |year| - docker_external_port = 6180 + year.to_i # 8193+ +podman_site "stateofthemap.org" do + image "ghcr.io/openstreetmap/stateofthemap-website:latest" + aliases ["www.stateofthemap.org", "stateofthemap.com", "www.stateofthemap.com", "sotm.org", "www.sotm.org"] +end - podman_service "#{year}.stateofthemap.org" do - description "Container service for #{year}.stateofthemap.org" +%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" - ports docker_external_port => "8080" - end - - ssl_certificate "#{year}.stateofthemap.org" do - domains ["#{year}.stateofthemap.org", "#{year}.stateofthemap.com", "#{year}.sotm.org"] - notifies :reload, "service[apache2]" - end - - apache_site "#{year}.stateofthemap.org" do - template "apache.container.erb" - variables :docker_external_port => docker_external_port, :aliases => ["#{year}.stateofthemap.com", "#{year}.sotm.org"] + aliases ["#{year}.stateofthemap.com", "#{year}.sotm.org"] end end