Make sure the planet user is created by recipes which use it

[chef.git] / cookbooks / foundation / recipes / owg.rb

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index 60878e22c55c987f74deee2d80da0042c738b94d..7054ec14a687ee766406eb67072fe9cc81bb0b0d 100644 (file)
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -17,25 +17,9 @@
 # limitations under the License.
 #
 
-include_recipe "apache"
-include_recipe "podman"
+include_recipe "podman::apache"
 
-docker_external_port = 8091
-
-podman_service "operations.osmfoundation.org" do
-  description "Container service for operations.osmfoundation.org"
+podman_site "operations.osmfoundation.org" do
   image "ghcr.io/openstreetmap/owg-website:latest"
-  ports docker_external_port => "8080"
-end
-
-ssl_certificate "operations.osmfoundation.org" do
-  domains ["operations.osmfoundation.org", "operations.openstreetmap.org", "operations.osm.org"]
-  notifies :reload, "service[apache2]"
-end
-
-apache_module "proxy_http"
-
-apache_site "operations.osmfoundation.org" do
-  template "apache.owg.erb"
-  variables :docker_external_port => docker_external_port, :aliases => ["operations.openstreetmap.org", "operations.osm.org"]
+  aliases ["operations.openstreetmap.org", "operations.osm.org"]
 end