Remove forced downgrade of hp-health

[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 90bdd4f27e6f31ff9a7c0ff4d3df5dd5c6a322dd..2ae7d0a1951289b95733bae32ef9e70058c6e7fd 100644 (file)
--- a/cookbooks/subversion/templates/default/apache.erb
+++ b/cookbooks/subversion/templates/default/apache.erb
@@ -1,26 +1,45 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # DO NOT EDIT - This file is being maintained by Chef
 

-<VirtualHost *:80>
+<VirtualHost *:443>

         ServerName <%= @name %>
         ServerAdmin webmaster@openstreetmap.org
 
         ServerName <%= @name %>
         ServerAdmin webmaster@openstreetmap.org
 

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

         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 %>
+
+                LimitXMLRequestBody 0
+                LimitRequestBody 0
+
+                <Limit GET PROPFIND OPTIONS REPORT>
+                        Require all granted
+                </Limit>
+
+                <LimitExcept GET PROPFIND OPTIONS REPORT>
+                        Require valid-user
+                </LimitExcept>
+        </Location>
+</VirtualHost>

 
 

-               AuthType Basic
-               AuthName "<%= @realm %>"
-               AuthUserFile <%= @password_file %>
+<VirtualHost *:80>
+        ServerName <%= @name %>
+        ServerAdmin webmaster@openstreetmap.org

 
 

-               LimitXMLRequestBody 0
-               LimitRequestBody 0
+        CustomLog /var/log/apache2/<%= @name %>-access.log combined
+        ErrorLog /var/log/apache2/<%= @name %>-error.log

 
 

-               <LimitExcept GET PROPFIND OPTIONS REPORT>
-                       Require valid-user
-               </LimitExcept>
-       </Location>
+        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+        RedirectPermanent / https://<%= @name %>/

 </VirtualHost>
 </VirtualHost>