X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0ff09336c78a7f9dbc446fcb66cb762980fb3ff5..e92ed5e09215d67f2bd7dc21a32425d7ec5aa26f:/cookbooks/chef/templates/default/apache.erb diff --git a/cookbooks/chef/templates/default/apache.erb b/cookbooks/chef/templates/default/apache.erb index 88684b82c..917759a7c 100644 --- a/cookbooks/chef/templates/default/apache.erb +++ b/cookbooks/chef/templates/default/apache.erb @@ -5,7 +5,7 @@ ServerAlias chef.osm.org ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/chef.openstreetmap.org-error.log RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ @@ -16,7 +16,7 @@ ServerName chef.openstreetmap.org ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/chef.openstreetmap.org-error.log SSLEngine on @@ -24,6 +24,7 @@ SSLCertificateFile /etc/ssl/certs/chef.openstreetmap.org.pem SSLCertificateKeyFile /etc/ssl/private/chef.openstreetmap.org.key + ProxyPassMatch ^/.*\.git/ ! ProxyPass / https://<%= node[:fqdn] %>:4443/ ProxyPreserveHost on