X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/024d0c2965ffe6b4438c3c53353698ea65dfc068..97b22cb709e69073a375b323ed7760b8a2d4f891:/cookbooks/dev/templates/default/apache.apis.erb?ds=sidebyside

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>