Add podman_site resource

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

diff --git a/cookbooks/subversion/recipes/default.rb b/cookbooks/subversion/recipes/default.rb
index d2eb7dfea811d788d1797d36d6ddf9ef02b83139..0e71c97339d2f090c16fd8bb195d1c62cf3ae6c4 100644 (file)
--- a/cookbooks/subversion/recipes/default.rb
+++ b/cookbooks/subversion/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: subversion
+# Cookbook:: subversion
 # Recipe:: default
 #
-# Copyright 2012, OpenStreetMap Foundation
+# Copyright:: 2012, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,36 +18,14 @@
 #
 
 include_recipe "apache"
+include_recipe "podman"
 
-package "subversion"
+docker_external_port = 8095
 
-repository_directory = "/var/lib/subversion/repos/openstreetmap"
-
-remote_directory "#{repository_directory}/hooks" do
-  source "hooks"
-  owner "www-data"
-  group "www-data"
-  mode 0o755
-  files_owner "www-data"
-  files_group "www-data"
-  files_mode 0o755
-  purge false
-end
-
-apache_module "dav" do
-  package "apache2"
-end
-
-apache_module "dav_fs" do
-  package "apache2"
-end
-
-apache_module "dav_svn" do
-  package "libapache2-svn"
-end
-
-apache_module "authz_svn" do
-  package "libapache2-svn"
+podman_service "svn.openstreetmap.org" do
+  description "Container service for svn.openstreetmap.org"
+  image "ghcr.io/openstreetmap/svn-website:latest"
+  ports docker_external_port => "8080"
 end
 
 ssl_certificate "svn.openstreetmap.org" do
@@ -55,15 +33,9 @@ ssl_certificate "svn.openstreetmap.org" do
   notifies :reload, "service[apache2]"
 end
 
+apache_module "proxy_http"
+
 apache_site "svn.openstreetmap.org" do
   template "apache.erb"
-  directory repository_directory
-  variables :realm => "Subversion Repository", :password_file => "/etc/apache2/svn.passwd", :aliases => ["svn.osm.org"]
-end
-
-template "/etc/cron.daily/svn-backup" do
-  source "backup.cron.erb"
-  owner "root"
-  group "root"
-  mode 0o755
+  variables :docker_external_port => docker_external_port, :aliases => ["svn.osm.org"]
 end