X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a7ac67b5bde2b06fd0626707930977d7ef3b305b..1bc8da5f3a3bfd6c3f0ba374f12d489d13831460:/cookbooks/subversion/recipes/default.rb diff --git a/cookbooks/subversion/recipes/default.rb b/cookbooks/subversion/recipes/default.rb index d2eb7dfea..3ce35840b 100644 --- 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. @@ -17,53 +17,9 @@ # limitations under the License. # -include_recipe "apache" +include_recipe "podman::apache" -package "subversion" - -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" -end - -ssl_certificate "svn.openstreetmap.org" do - domains ["svn.openstreetmap.org", "svn.osm.org"] - notifies :reload, "service[apache2]" -end - -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 +podman_site "svn.openstreetmap.org" do + image "ghcr.io/openstreetmap/svn-website:latest" + aliases ["svn.osm.org"] end