From: Tom Hughes <tom@compton.nu>
Date: Tue, 11 Feb 2014 13:53:44 +0000 (+0000)
Subject: Redirect https requests to osm.org to www.osm.org
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/edb4306c20393d628929d27ebda556c77dc437b4

Redirect https requests to osm.org to www.osm.org
---

diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 206d54c07..8effc61e5 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -282,6 +282,15 @@
   RedirectPermanent / http://www.openstreetmap.org/
 </VirtualHost>
 
+<VirtualHost *:443>
+  ServerName openstreetmap.org
+  ServerAlias maps.openstreetmap.org mapz.openstreetmap.org
+
+  SSLEngine on
+
+  RedirectPermanent / https://www.openstreetmap.org/
+</VirtualHost>
+
 <VirtualHost *:80>
   ServerName openstreetmap.org.uk
   ServerAlias www.openstreetmap.org.uk