From: Paul Wise <pabs@debian.org>
Date: Thu, 5 Oct 2017 08:37:09 +0000 (+0800)
Subject: Revert "Use RedirectPermanent instead of RewriteRule"
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=14fa2238b4275e88a87ccdc6a5fcb9c0d52a7ede;p=mirror%2Fdsa-puppet.git

Revert "Use RedirectPermanent instead of RewriteRule"

This reverts commit abb8a9a1d0c72a616e297be5a1b091b6c9a74191.
---

diff --git a/modules/roles/templates/apache-ftp.ports.debian.org.erb b/modules/roles/templates/apache-ftp.ports.debian.org.erb
index 6b5ee3e71..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 %>
 
-	RedirectPermanent /debian-ports-cd https://cdimage.debian.org/cdimage/ports/
+	RedirectMatch "^/debian-ports-cd/.*$" https://cdimage.debian.org/cdimage/ports/
 
 	<IfModule mod_userdir.c>
 		UserDir disabled