Remove traces of lockheed

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

diff --git a/cookbooks/subversion/recipes/default.rb b/cookbooks/subversion/recipes/default.rb
index 8419bbc40dfd3d6348e51e76870961ec54c894a0..9804e43e9649f1335a6ba6f2f32630ca14402eb4 100644 (file)
--- a/cookbooks/subversion/recipes/default.rb
+++ b/cookbooks/subversion/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: subversion
+# Cookbook:: subversion

 # Recipe:: default
 #
 # 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.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,55 +17,16 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
+include_recipe "apache"

 
 

-package "subversion"
+apache_module "rewrite"

 
 

-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
-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
-
-ssl_certificate site_name do
-  domains site_name
-  fallback_certificate "openstreetmap"
+ssl_certificate "svn.openstreetmap.org" do
+  domains ["svn.openstreetmap.org", "svn.osm.org"]

   notifies :reload, "service[apache2]"
 end
 
   notifies :reload, "service[apache2]"
 end
 

-apache_site site_name do
+apache_site "svn.openstreetmap.org" do

   template "apache.erb"
   template "apache.erb"

-  directory repository_directory
-  variables :realm => "Subversion Repository", :password_file => "/etc/apache2/svn.passwd"
-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