From 1a5a75449b3bccf694a0f70bff7a294f990d9215 Mon Sep 17 00:00:00 2001
From: Paul Wise <pabs@debian.org>
Date: Fri, 1 Apr 2016 14:01:40 +0800
Subject: [PATCH] Fix some issues with the previous change.

---
 .../roles/templates/apache-www.debian.org.erb | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index aaebe84d6..8be28f028 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -144,10 +144,6 @@
    DocumentRoot <%= wwwdo_document_root %>/
    ErrorLog /var/log/apache2/www-other.debian.org-error.log
    CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
-   #RewriteLog /var/log/apache2/www-other.debian.org-redirect.log
-   #RewriteLogLevel 1
-
-   RewriteEngine on
 </Macro>
 
 <Macro common-www.d.o>
@@ -281,16 +277,6 @@
 </Macro>
 
 
-<VirtualHost <%= vhost_listen %> >
-   Use common-www-other.d.o
-   RewriteRule ^/(.*)$ http://www.debian.org/$1 [R=301,L]
-</VirtualHost>
-<VirtualHost <%= vhost_listen_443 %> >
-   Use common-www-other.d.o
-   RewriteRule ^/(.*)$ https://www.debian.org/$1 [R=301,L]
-</VirtualHost>
-
-
 <VirtualHost <%= vhost_listen %> >
    ErrorLog /var/log/apache2/www.debian.org-error.log
    CustomLog /var/log/apache2/www.debian.org-access.log privacy
@@ -308,16 +294,22 @@
 </VirtualHost>
 
 
+<VirtualHost <%= vhost_listen %> >
+   Use common-www-other.d.o
+
+   ErrorLog /var/log/apache2/www-other.debian.org-error.log
+   CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
+
+   Redirect permanent / http://www.debian.org/
+</VirtualHost>
 <VirtualHost <%= vhost_listen_443 %> >
-   ServerName debian.org
-   ServerAdmin webmaster@debian.org
+   Use common-www-other.d.o
 
    CustomLog /var/log/apache2/www-other-access.log privacyssl
    ErrorLog /var/log/apache2/www-other-error.log
 
    Redirect permanent / https://www.debian.org/
 
-
    Use common-debian-service-ssl www.debian.org
    Use common-ssl-HSTS
 </VirtualHost>
-- 
2.20.1