X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0561180c60e5a2a51176ce816fb8f918eed013d4..4479ee5c32b8d5c7dc6cef37b4bbaed9402ed4fb:/cookbooks/dns/templates/default/apache.erb?ds=sidebyside

diff --git a/cookbooks/dns/templates/default/apache.erb b/cookbooks/dns/templates/default/apache.erb
index 100d24e07..fd555e886 100644
--- a/cookbooks/dns/templates/default/apache.erb
+++ b/cookbooks/dns/templates/default/apache.erb
@@ -7,6 +7,21 @@
 	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>
+
+<VirtualHost *:443>
+	ServerName <%= @name %>
+	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
+
 	DocumentRoot <%= @directory %>/html
 	Alias /json/ /var/lib/dns/json/
 </VirtualHost>