subversion: Disable svn.osm.org and add redirect

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

diff --git a/cookbooks/subversion/recipes/default.rb b/cookbooks/subversion/recipes/default.rb
index 8ec5431ab5b62843c15ad1ac9afd7b9a58736de2..7cba5bc73efd01650ec30b3f9d48460a6baf6ca8 100644 (file)
--- 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,52 +19,38 @@
 
 include_recipe "apache"
 
-package "subversion"
-
-site_name = "svn.openstreetmap.org"
-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
+package "subversion" do
+  action :remove
 end
 
 apache_module "dav" do
-  package "apache2"
+  action :disable
 end
 
 apache_module "dav_fs" do
-  package "apache2"
+  action :disable
 end
 
 apache_module "dav_svn" do
-  package "libapache2-svn"
+  package "libapache2-mod-svn"
+  action [:disable, :delete]
 end
 
 apache_module "authz_svn" do
-  package "libapache2-svn"
+  package "libapache2-mod-svn"
+  action [:disable, :delete]
 end
 
-ssl_certificate site_name do
-  domains site_name
+ssl_certificate "svn.openstreetmap.org" do
+  domains ["svn.openstreetmap.org", "svn.osm.org"]
   notifies :reload, "service[apache2]"
 end
 
-apache_site site_name do
+apache_site "svn.openstreetmap.org" do
   template "apache.erb"
-  directory repository_directory
-  variables :realm => "Subversion Repository", :password_file => "/etc/apache2/svn.passwd"
+  variables :aliases => ["svn.osm.org"]
 end
 
-template "/etc/cron.daily/svn-backup" do
-  source "backup.cron.erb"
-  owner "root"
-  group "root"
-  mode 0o755
+file "/etc/cron.daily/svn-backup" do
+  action :delete
 end