put pummelzacken back into update mode

[chef.git] / cookbooks / git / templates / default / apache.erb

diff --git a/cookbooks/git/templates/default/apache.erb b/cookbooks/git/templates/default/apache.erb
index e9bebd2ea46002511e1bc6e51c7c7a741f0ba348..21e0aa077d8dea19edfe6af165b615b250860617 100644 (file)
--- 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