From: Paul Wise <pabs@debian.org>
Date: Fri, 1 Apr 2016 05:47:56 +0000 (+0800)
Subject: Redirect https URLs for www-other sites to debian.org too.
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4857bcfb3256229f339fd34d2d5c75cce2012f5e;p=mirror%2Fdsa-puppet.git

Redirect https URLs for www-other sites to debian.org too.

Suggested-in: <CAKiQC487c4kZiTvxUYtM+nmWS9Bh3b7s3tY6jb2=eA69k0-9Ww@mail.gmail.com>
Suggested-by: Adam Cadman <adam.cadman@gmail.com>
---

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index 4ecbf4e2c..aaebe84d6 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -90,7 +90,7 @@
   </Files>
 </Directory>
 
-<VirtualHost <%= vhost_listen %> >
+<Macro common-www-other.d.o>
    ServerName debian.org
    ServerAdmin webmaster@debian.org
 
@@ -148,10 +148,7 @@
    #RewriteLogLevel 1
 
    RewriteEngine on
-   RewriteRule ^/(.*)$ http://www.debian.org/$1 [R=301,L]
-</VirtualHost>
-
-
+</Macro>
 
 <Macro common-www.d.o>
    ServerName www.debian.org
@@ -284,6 +281,16 @@
 </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