stateofthemap: Move Chooser to container

[chef.git] / cookbooks / stateofthemap / recipes / container.rb

diff --git a/cookbooks/stateofthemap/recipes/container.rb b/cookbooks/stateofthemap/recipes/container.rb
index b5a7640acd8fcb112cc33e3b100e911f8f920887..5a7de8d527d59286a59789b47fb51695c8fcfc3d 100644 (file)
--- a/cookbooks/stateofthemap/recipes/container.rb
+++ b/cookbooks/stateofthemap/recipes/container.rb
@@ -22,8 +22,28 @@ include_recipe "podman"
 
 apache_module "proxy_http"
 
 
 apache_module "proxy_http"
 

+docker_external_port = 8096
+
+podman_service "www.stateofthemap.org" do
+  description "Container service for www.stateofthemap.org"
+  image "ghcr.io/openstreetmap/stateofthemap-website:latest"
+  ports docker_external_port => "8080"
+end
+
+ssl_certificate "stateofthemap.org" do
+  domains ["stateofthemap.org", "www.stateofthemap.org",
+           "stateofthemap.com", "www.stateofthemap.com",
+           "sotm.org", "www.sotm.org"]
+  notifies :reload, "service[apache2]"
+end
+
+apache_site "stateofthemap.org" do
+  template "apache.container.erb"
+  variables :docker_external_port => docker_external_port, :aliases => ["www.stateofthemap.org", "stateofthemap.com", "www.stateofthemap.com", "sotm.org", "www.sotm.org"]
+end
+

 %w[2013 2016 2017 2018 2019 2020 2021 2022].each do |year|
 %w[2013 2016 2017 2018 2019 2020 2021 2022].each do |year|

-  docker_external_port = 6080 + year.to_i # 8093+
+  docker_external_port = 6180 + year.to_i # 8193+

 
   podman_service "#{year}.stateofthemap.org" do
     description "Container service for #{year}.stateofthemap.org"
 
   podman_service "#{year}.stateofthemap.org" do
     description "Container service for #{year}.stateofthemap.org"