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 7cba5bc73efd01650ec30b3f9d48460a6baf6ca8..9804e43e9649f1335a6ba6f2f32630ca14402eb4 100644 (file)
--- a/cookbooks/subversion/recipes/default.rb
+++ b/cookbooks/subversion/recipes/default.rb
@@ -19,27 +19,7 @@
 
 include_recipe "apache"
 
 
 include_recipe "apache"
 

-package "subversion" do
-  action :remove
-end
-
-apache_module "dav" do
-  action :disable
-end
-
-apache_module "dav_fs" do
-  action :disable
-end
-
-apache_module "dav_svn" do
-  package "libapache2-mod-svn"
-  action [:disable, :delete]
-end
-
-apache_module "authz_svn" do
-  package "libapache2-mod-svn"
-  action [:disable, :delete]
-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"]


@@ -50,7 +30,3 @@ apache_site "svn.openstreetmap.org" do
   template "apache.erb"
   variables :aliases => ["svn.osm.org"]
 end
   template "apache.erb"
   variables :aliases => ["svn.osm.org"]
 end

-
-file "/etc/cron.daily/svn-backup" do
-  action :delete
-end