X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/88d22f60f165338495c6c9980b8a3f34ae047be9..492559ef865a09dba696babf6178a05b33cc2eb8:/cookbooks/dev/templates/default/apache.apis.erb

diff --git a/cookbooks/dev/templates/default/apache.apis.erb b/cookbooks/dev/templates/default/apache.apis.erb
index 1afec5c93..c1eddbdb2 100644
--- a/cookbooks/dev/templates/default/apache.apis.erb
+++ b/cookbooks/dev/templates/default/apache.apis.erb
@@ -1,13 +1,28 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-<VirtualHost *:80>
+<VirtualHost *:443>
 	ServerName apis.dev.openstreetmap.org
 	ServerAdmin webmaster@openstreetmap.org
 
+	SSLEngine on
+	SSLCertificateFile /etc/ssl/certs/apis.dev.openstreetmap.org.pem
+	SSLCertificateKeyFile /etc/ssl/private/apis.dev.openstreetmap.org.key
+
+	CustomLog /var/log/apache2/apis.dev.openstreetmap.org-access.log combined
+	ErrorLog /var/log/apache2/apis.dev.openstreetmap.org-error.log
+
 	DocumentRoot /srv/apis.dev.openstreetmap.org
+</VirtualHost>
+
+<VirtualHost *:80>
+	ServerName apis.dev.openstreetmap.org
+	ServerAdmin webmaster@openstreetmap.org
 
 	CustomLog /var/log/apache2/apis.dev.openstreetmap.org-access.log combined
 	ErrorLog /var/log/apache2/apis.dev.openstreetmap.org-error.log
+
+	RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+	RedirectPermanent / https://apis.dev.openstreetmap.org/
 </VirtualHost>
 
 <Directory /srv/apis.dev.openstreetmap.org>