X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c61dad4d0afbe41d85716e5231e76d94b6a529af..41b4f8ccdff661e5463961da893ef91866e9f74c:/cookbooks/subversion/recipes/default.rb diff --git a/cookbooks/subversion/recipes/default.rb b/cookbooks/subversion/recipes/default.rb index f5803e5ee..9804e43e9 100644 --- a/cookbooks/subversion/recipes/default.rb +++ b/cookbooks/subversion/recipes/default.rb @@ -19,36 +19,7 @@ include_recipe "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-mod-svn" -end - -apache_module "authz_svn" do - package "libapache2-mod-svn" -end +apache_module "rewrite" ssl_certificate "svn.openstreetmap.org" do domains ["svn.openstreetmap.org", "svn.osm.org"] @@ -57,13 +28,5 @@ 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 + variables :aliases => ["svn.osm.org"] end