From: Julien Cristau <jcristau@debian.org>
Date: Thu, 17 Jan 2019 15:37:04 +0000 (+0100)
Subject: www.debconf.org vhost update
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6b4d7fb71235c21faa26acbca411ef8d8eb13f73;p=mirror%2Fdsa-puppet.git

www.debconf.org vhost update

Add missing redirects from current config on kent.debconf.org
---

diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index 15199353e..ae88c00d3 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -198,10 +198,25 @@
 	ServerAlias www-test.debconf.org
 
 	<Directory /srv/static.debian.org/mirrors/www.debconf.org/cur>
-		Options +Includes
+		Options +IncludesNOEXEC
+		DirectoryIndex index.shtml
 	</Directory>
 
 	AddOutputFilter INCLUDES .shtml
+
+	RewriteEngine On
+	# A few redirects for older debconf sites, so old links work
+	RewriteRule ^/gallery/(.*)$ https://gallery.debconf.org/v/$1 [R=permanent,L]
+	RewriteRule ^/.*years$ https://10years.debconf.org/ [R=permanent,L]
+	RewriteRule ^/debconf2$ https://debconf2.debconf.org/ [R=permanent,L]
+	RewriteRule ^/debconf3$ https://debconf3.debconf.org/ [R=permanent,L]
+	RewriteRule ^/debconf4$ https://debconf4.debconf.org/ [R=permanent,L]
+	RewriteRule ^/debconf5$ https://debconf5.debconf.org/ [R=permanent,L]
+	RewriteRule ^/10years/(.*)$ https://10years.debconf.org/$1 [R=permanent,L]
+	RewriteRule ^/debconf2/(.*)$ https://debconf2.debconf.org/$1 [R=permanent,L]
+	RewriteRule ^/debconf3/(.*)$ https://debconf3.debconf.org/$1 [R=permanent,L]
+	RewriteRule ^/debconf4/(.*)$ https://debconf4.debconf.org/$1 [R=permanent,L]
+	RewriteRule ^/debconf5/(.*)$ https://debconf5.debconf.org/$1 [R=permanent,L]
 </Macro>
 
 <%=