Add https support to svn.openstreetmap.org

diff --git a/cookbooks/subversion/recipes/default.rb b/cookbooks/subversion/recipes/default.rb
index 3f024259905bd052adeee61f199acf44553dd2c6..10de0520de67e65a723a05427656c5327100b67a 100644 (file)
--- a/cookbooks/subversion/recipes/default.rb
+++ b/cookbooks/subversion/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

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

 
 package "subversion"
 
 
 package "subversion"
 

diff --git a/cookbooks/subversion/templates/default/apache.erb b/cookbooks/subversion/templates/default/apache.erb
index 507379fd56d583bf37a7ab8fd4718c5d81611c62..ae5c4031737577247ab2b8c3b21118a4d7011e07 100644 (file)
--- 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
 # 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
         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
 
 
         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>
 </VirtualHost>

+<% end -%>