X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5680fb8cfeab3486ae5bfe1283ffc6cf13ac57a2..524d90d022751710980613df6b943291fc1498d6:/cookbooks/chef/templates/default/apache.erb?ds=sidebyside diff --git a/cookbooks/chef/templates/default/apache.erb b/cookbooks/chef/templates/default/apache.erb index f6c1806b1..9d86d910e 100644 --- a/cookbooks/chef/templates/default/apache.erb +++ b/cookbooks/chef/templates/default/apache.erb @@ -8,6 +8,7 @@ CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined ErrorLog /var/log/apache2/chef.openstreetmap.org-error.log + RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ Redirect permanent / https://chef.openstreetmap.org/ @@ -20,6 +21,10 @@ SSLEngine on SSLProxyEngine on + 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