Redirect http to https for planet

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

diff --git a/cookbooks/planet/templates/default/apache.erb b/cookbooks/planet/templates/default/apache.erb
index dd2c824e1e466b10c07118e3128ff330496ffb11..a8a761a879808f4e7ecddc5c8732165a6f7acad9 100644 (file)
--- a/cookbooks/planet/templates/default/apache.erb
+++ b/cookbooks/planet/templates/default/apache.erb
@@ -5,13 +5,13 @@
         ServerAlias planet.osm.org
         ServerAdmin webmaster@openstreetmap.org
 
+        CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined
+        ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log
+
         SSLEngine on
         SSLCertificateFile /etc/ssl/certs/planet.openstreetmap.org.pem
         SSLCertificateKeyFile /etc/ssl/private/planet.openstreetmap.org.key
 
-        CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined
-        ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log
-
         DocumentRoot /store/planet
 
         <Directory /store/planet>
@@ -60,13 +60,13 @@
 </VirtualHost>
 
 <VirtualHost *:80>
-       ServerName planet.openstreetmap.org
-       ServerAlias planet.osm.org
-       ServerAdmin webmaster@openstreetmap.org
+        ServerName planet.openstreetmap.org
+        ServerAlias planet.osm.org
+        ServerAdmin webmaster@openstreetmap.org
 
-       CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined
-       ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log
+        CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined
+        ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log
 
-       RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
-       RedirectPermanent / https://planet.openstreetmap.org/
+        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+        RedirectPermanent / https://planet.openstreetmap.org/
 </VirtualHost>