Merge remote-tracking branch 'github/pull/631'

[chef.git] / cookbooks / subversion / recipes / default.rb

diff --git a/cookbooks/subversion/recipes/default.rb b/cookbooks/subversion/recipes/default.rb
index 0e71c97339d2f090c16fd8bb195d1c62cf3ae6c4..3ce35840bfcb7f758bef9154768fa593b2cfbb33 100644 (file)
--- a/cookbooks/subversion/recipes/default.rb
+++ b/cookbooks/subversion/recipes/default.rb
@@ -17,25 +17,9 @@
 # limitations under the License.
 #
 
-include_recipe "apache"
-include_recipe "podman"
+include_recipe "podman::apache"
 
-docker_external_port = 8095
-
-podman_service "svn.openstreetmap.org" do
-  description "Container service for svn.openstreetmap.org"
+podman_site "svn.openstreetmap.org" do
   image "ghcr.io/openstreetmap/svn-website:latest"
-  ports docker_external_port => "8080"
-end
-
-ssl_certificate "svn.openstreetmap.org" do
-  domains ["svn.openstreetmap.org", "svn.osm.org"]
-  notifies :reload, "service[apache2]"
-end
-
-apache_module "proxy_http"
-
-apache_site "svn.openstreetmap.org" do
-  template "apache.erb"
-  variables :docker_external_port => docker_external_port, :aliases => ["svn.osm.org"]
+  aliases ["svn.osm.org"]
 end