X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a7ac67b5bde2b06fd0626707930977d7ef3b305b..41b4f8ccdff661e5463961da893ef91866e9f74c:/cookbooks/subversion/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/subversion/recipes/default.rb b/cookbooks/subversion/recipes/default.rb
index d2eb7dfea..9804e43e9 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.
@@ -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-svn"
-end
-
-apache_module "authz_svn" do
-  package "libapache2-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