From cc72dc2d2fdd53030fb34a0f0842002bcc105f68 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 16 Apr 2015 20:10:11 +0100
Subject: [PATCH 1/1] Add https support to svn.openstreetmap.org

---
 cookbooks/subversion/recipes/default.rb       |  2 +-
 .../subversion/templates/default/apache.erb   | 38 +++++++++++--------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/cookbooks/subversion/recipes/default.rb b/cookbooks/subversion/recipes/default.rb
index 3f0242599..10de0520d 100644
--- a/cookbooks/subversion/recipes/default.rb
+++ b/cookbooks/subversion/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache"
+include_recipe "apache::ssl"
 
 package "subversion"
 
diff --git a/cookbooks/subversion/templates/default/apache.erb b/cookbooks/subversion/templates/default/apache.erb
index 507379fd5..ae5c40317 100644
--- a/cookbooks/subversion/templates/default/apache.erb
+++ b/cookbooks/subversion/templates/default/apache.erb
@@ -1,30 +1,36 @@
 # DO NOT EDIT - This file is being maintained by Chef
+<% [80, 443].each do |port| -%>
 
-<VirtualHost *:80>
+<VirtualHost *:<%= port %>>
         ServerName <%= @name %>
         ServerAdmin webmaster@openstreetmap.org
+<% if port == 443 -%>
+
+        SSLEngine on
+<% end -%>
 
         CustomLog /var/log/apache2/<%= @name %>-access.log combined
         CustomLog /var/log/apache2/<%= @name %>-svn-access.log "%h %t %u %{SVN-ACTION}e" env=SVN-ACTION
         ErrorLog /var/log/apache2/<%= @name %>-error.log
 
-	<Location />
-		DAV svn
-		SVNPath <%= @directory %>
+        <Location />
+                DAV svn
+                SVNPath <%= @directory %>
 
-		AuthType Basic
-		AuthName "<%= @realm %>"
-		AuthUserFile <%= @password_file %>
+                AuthType Basic
+                AuthName "<%= @realm %>"
+                AuthUserFile <%= @password_file %>
 
-		LimitXMLRequestBody 0
-		LimitRequestBody 0
+                LimitXMLRequestBody 0
+                LimitRequestBody 0
 
-		<Limit GET PROPFIND OPTIONS REPORT>
-			Require all granted
-		</Limit>
+                <Limit GET PROPFIND OPTIONS REPORT>
+                        Require all granted
+                </Limit>
 
-		<LimitExcept GET PROPFIND OPTIONS REPORT>
-			Require valid-user
-		</LimitExcept>
-	</Location>
+                <LimitExcept GET PROPFIND OPTIONS REPORT>
+                        Require valid-user
+                </LimitExcept>
+        </Location>
 </VirtualHost>
+<% end -%>
-- 
2.43.2