From: Aurelien Jarno <aurelien@aurel32.net>
Date: Thu, 5 Oct 2017 08:21:22 +0000 (+0200)
Subject: Better debian-ports.org/debian-cd redirection
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1e92eaa0c47785f00735ef79c91d21762f88572e;p=mirror%2Fdsa-puppet.git

Better debian-ports.org/debian-cd redirection

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/modules/roles/templates/apache-ftp.ports.debian.org.erb b/modules/roles/templates/apache-ftp.ports.debian.org.erb
index 620bab79b..82bac2357 100644
--- a/modules/roles/templates/apache-ftp.ports.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.ports.debian.org.erb
@@ -18,7 +18,7 @@
 	Alias /debian-ports <%= @archive_root %>
 	Use ftp-archive <%= @archive_root %>
 
-	RewriteRule ^/debian-ports-cd/.*$ https://cdimage.debian.org/cdimage/ports/ [L,R=permanent]
+	RedirectMatch "^/debian-ports-cd/.*$" https://cdimage.debian.org/cdimage/ports/
 
 	<IfModule mod_userdir.c>
 		UserDir disabled