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

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

diff --git a/cookbooks/subversion/recipes/default.rb b/cookbooks/subversion/recipes/default.rb
index 7014c2d5fa5f74e9735121b0e43f2f3c40e1c262..9804e43e9649f1335a6ba6f2f32630ca14402eb4 100644 (file)
--- a/cookbooks/subversion/recipes/default.rb
+++ b/cookbooks/subversion/recipes/default.rb
@@ -19,36 +19,7 @@
 
 include_recipe "apache"
 
 
 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"]
 
 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"
 
 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
 end