Update hardware cookbook for new version of Intel SSD tool

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

diff --git a/cookbooks/subversion/recipes/default.rb b/cookbooks/subversion/recipes/default.rb
index 10de0520de67e65a723a05427656c5327100b67a..d2eb7dfea811d788d1797d36d6ddf9ef02b83139 100644 (file)
--- a/cookbooks/subversion/recipes/default.rb
+++ b/cookbooks/subversion/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # 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,21 +17,20 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
+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 0755
+  mode 0o755

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

-  files_mode 0755
+  files_mode 0o755

   purge false
 end
 
   purge false
 end
 


@@ -51,15 +50,20 @@ apache_module "authz_svn" do
   package "libapache2-svn"
 end
 
   package "libapache2-svn"
 end
 

-apache_site site_name do
+ssl_certificate "svn.openstreetmap.org" do
+  domains ["svn.openstreetmap.org", "svn.osm.org"]
+  notifies :reload, "service[apache2]"
+end
+
+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 0755
+  mode 0o755

 end
 end