Use separate FPM pools for donate and dmca sites

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

diff --git a/cookbooks/subversion/recipes/default.rb b/cookbooks/subversion/recipes/default.rb
index 582dbaed370d8dabd8f737550118ea4661e6ea53..f38efb7b80fafd6a0623797a4b15ea2021baf72c 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,


@@ -21,17 +21,16 @@ include_recipe "apache"
 
 package "subversion"
 
 
 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"
 repository_directory = "/var/lib/subversion/repos/openstreetmap"
 
 remote_directory "#{repository_directory}/hooks" do
   source "hooks"
   owner "www-data"
   group "www-data"

-  mode 0o755
+  mode "755"

   files_owner "www-data"
   files_group "www-data"
   files_owner "www-data"
   files_group "www-data"

-  files_mode 0o755
+  files_mode "755"

   purge false
 end
 
   purge false
 end
 


@@ -44,27 +43,27 @@ apache_module "dav_fs" do
 end
 
 apache_module "dav_svn" do
 end
 
 apache_module "dav_svn" do

-  package "libapache2-svn"
+  package "libapache2-mod-svn"

 end
 
 apache_module "authz_svn" do
 end
 
 apache_module "authz_svn" do

-  package "libapache2-svn"
+  package "libapache2-mod-svn"

 end
 
 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
 
   notifies :reload, "service[apache2]"
 end
 

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

   template "apache.erb"
   directory repository_directory
   template "apache.erb"
   directory repository_directory

-  variables :realm => "Subversion Repository", :password_file => "/etc/apache2/svn.passwd"
+  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"
 end
 
 template "/etc/cron.daily/svn-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 end