Make sure we use the correct gem and bundler for blogs

[chef.git] / cookbooks / subversion / templates / default / apache.erb

diff --git a/cookbooks/subversion/templates/default/apache.erb b/cookbooks/subversion/templates/default/apache.erb
index 314701a5bf2dae954c1abeeb56ebddd4823b4f30..cadae8b0892055d4cef99aeaeb41ef24e0f62623 100644 (file)
--- a/cookbooks/subversion/templates/default/apache.erb
+++ b/cookbooks/subversion/templates/default/apache.erb
@@ -4,6 +4,8 @@
   ServerName <%= @name %>
   ServerAdmin webmaster@openstreetmap.org
 
   ServerName <%= @name %>
   ServerAdmin webmaster@openstreetmap.org
 

+  Protocols http/1.1
+

   SSLEngine on
   SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
   SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
   SSLEngine on
   SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
   SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key


@@ -17,10 +19,6 @@
     SVNPath <%= @directory %>
     SVNIndexXSLT /svnindex.xsl
 
     SVNPath <%= @directory %>
     SVNIndexXSLT /svnindex.xsl
 

-    AuthType Basic
-    AuthName "<%= @realm %>"
-    AuthUserFile <%= @password_file %>
-

     LimitXMLRequestBody 0
     LimitRequestBody 0
 
     LimitXMLRequestBody 0
     LimitRequestBody 0
 


@@ -29,7 +27,7 @@
     </Limit>
 
     <LimitExcept GET PROPFIND OPTIONS REPORT>
     </Limit>
 
     <LimitExcept GET PROPFIND OPTIONS REPORT>

-      Require valid-user
+      Require all denied

     </LimitExcept>
   </Location>
 </VirtualHost>
     </LimitExcept>
   </Location>
 </VirtualHost>