From 6fcd4e5fe49648d1832465308790beede845b098 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 5 Oct 2018 15:02:04 +0100
Subject: [PATCH] Redirect all HTTP except openstreetmap.org straight to www

---
 .../web/templates/default/apache.frontend.erb    | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 27a1b79b0..51d43a394 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -268,7 +268,6 @@
 
 <VirtualHost *:80>
   ServerName openstreetmap.org
-  ServerAlias *
 
   Header always set Cache-Control "max-age=31536000"
   Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT"
@@ -281,6 +280,21 @@
   RewriteRule ^(.*)$ https://openstreetmap.org$1 [L,NE,R=permanent]
 </VirtualHost>
 
+<VirtualHost *:80>
+  ServerName www.openstreetmap.org
+  ServerAlias *
+
+  Header always set Cache-Control "max-age=31536000"
+  Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT"
+
+  RewriteEngine on
+
+  RewriteRule ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 [R=permanent,L]
+
+  RewriteCond %{REQUEST_URI} !^/server-status$
+  RewriteRule ^(.*)$ https://www.openstreetmap.org$1 [L,NE,R=permanent]
+</VirtualHost>
+
 <VirtualHost *:443>
   ServerName openstreetmap.org
   ServerAlias *
-- 
2.43.2