X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/72dc9f953f57826a7ec8413081dd386dfc56a0dc..55fc22bb3b3c7adfd60c2c4865e52d71c7de3572:/cookbooks/git/templates/default/apache.erb

diff --git a/cookbooks/git/templates/default/apache.erb b/cookbooks/git/templates/default/apache.erb
index e9bebd2ea..21e0aa077 100644
--- a/cookbooks/git/templates/default/apache.erb
+++ b/cookbooks/git/templates/default/apache.erb
@@ -7,6 +7,7 @@
 	CustomLog /var/log/apache2/<%= @name %>-access.log combined
 	ErrorLog /var/log/apache2/<%= @name %>-error.log
 
+	RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
 	RedirectPermanent / https://<%= @name %>/
 </VirtualHost>
 
@@ -15,6 +16,8 @@
 	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
 	ErrorLog /var/log/apache2/<%= @name %>-error.log