palulukon: Allow access to AWS IP metadata NTP service

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

diff --git a/cookbooks/stateofthemap/recipes/container.rb b/cookbooks/stateofthemap/recipes/container.rb
index 5a7de8d527d59286a59789b47fb51695c8fcfc3d..3b5bd38b9fd916503a92220655804d6ea3638582 100644 (file)
--- a/cookbooks/stateofthemap/recipes/container.rb
+++ b/cookbooks/stateofthemap/recipes/container.rb
@@ -17,47 +17,16 @@
 # limitations under the License.
 #
 
-include_recipe "apache"
-include_recipe "podman"
+include_recipe "podman::apache"
 
-apache_module "proxy_http"
-
-docker_external_port = 8096
-
-podman_service "www.stateofthemap.org" do
-  description "Container service for www.stateofthemap.org"
+podman_site "stateofthemap.org" do
   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"]
+  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|
-  docker_external_port = 6180 + year.to_i # 8193+
-
-  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