X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ae995f5ddab395f6c4a94b7690f77116c0e7d53e..200f486870c88f3916ede7bcb36b47b374a63901:/cookbooks/git/templates/default/apache.erb diff --git a/cookbooks/git/templates/default/apache.erb b/cookbooks/git/templates/default/apache.erb index 07d11a804..daff9de88 100644 --- a/cookbooks/git/templates/default/apache.erb +++ b/cookbooks/git/templates/default/apache.erb @@ -7,7 +7,7 @@ <% end -%> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ @@ -26,7 +26,7 @@ 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 %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log RedirectPermanent / https://<%= @name %>/ @@ -41,7 +41,7 @@ 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 %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log SetEnv GIT_PROJECT_ROOT /var/lib/git @@ -65,7 +65,7 @@ Alias /git /var/cache/git ScriptAlias / /usr/lib/cgi-bin/gitweb.cgi/ - + Require all granted <% unless @private_allowed.empty? -%>