Add more ssh host keys

[chef.git] / 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 1afec5c9338659e7559d70e234813af5b2a1cb9e..c1eddbdb2b1e83924d95c986a9069a82e786163b 100644 (file)
--- 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>