X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3c7e8fb2b0c038be14b6432b0c06db93e6f208b2..c3eaabdeabe865ec028693cbb4d77a0f7a88a90a:/cookbooks/subversion/templates/default/apache.erb 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| -%> - +> 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 - - DAV svn - SVNPath <%= @directory %> + + 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 - - Require all granted - + + Require all granted + - - Require valid-user - - + + Require valid-user + + +<% end -%>