From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 13 Oct 2016 07:06:39 +0000 (+0200)
Subject: remove double slashes on metadata.ftp-master.debian.org
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ada478a49459e46485f3e9a3fe1253b875d99088;p=mirror%2Fdsa-puppet.git

remove double slashes on metadata.ftp-debian.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 198ea2a6d..0acb605a5 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -23,6 +23,12 @@
 
 <Macro vstatic-vhost-extra-metadata.ftp-master.debian.org>
 	AddDefaultCharset utf-8
+
+	# Rewrite away double slashes
+	RewriteEngine on
+	RewriteCond %{REQUEST_URI} ^(.*)//(.*)$ [NC]
+	RewriteRule . %1/%2 [R=301,L,NE]
+
 	<LocationMatch "/changelogs/(main|contrib|non-free)">
 		ForceType text/plain
 	</LocationMatch>