X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fmanpages.debian.org.erb;h=c4983a922fffcd970cbc129afb10e4baaf26df97;hb=bedd29e6a7b4c3539e37d23c9025898fb1f9311c;hp=b553829d5f803b5bf42e9eeb9f631850c105e11d;hpb=981874fde01eaa8d8b251d7ab8ccfffecd7e1d13;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/static-mirroring/vhost/manpages.debian.org.erb b/modules/roles/templates/static-mirroring/vhost/manpages.debian.org.erb
index b553829d5..c4983a922 100644
--- a/modules/roles/templates/static-mirroring/vhost/manpages.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/manpages.debian.org.erb
@@ -10,9 +10,14 @@
 	SetEnvIf Accept-Language "^$" ACCLANG=en INITIAL=t
 
 	RewriteEngine on
-	RewriteMap manpagesall dbm:/srv/manpages.debian.org/www/rwmap.dbm
+	RewriteMap manpagesall dbm:/srv/static.debian.org/mirrors/manpages.debian.org/cur/rwmap.dbm
 	RewriteMap lc int:tolower
 
+	# Redirect old CGI paths (without CGI file name), keeping at least the
+	# manpage (the other parameters are left out for simplicity).
+	RewriteCond %{QUERY_STRING} (?:.*(?:^|&))query=([^&]+)
+	RewriteRule ^/?$ /%1 [redirect=307,qsdiscard,last]
+
 	# URLs which end in a slash do not need to be rewritten
 	RewriteRule /$ - [last]
 
@@ -85,6 +90,12 @@
 			Require all denied
 		</Files>
 
+		# DefaultType doesn’t work since Apache 2.3.x, so we need to match
+		# non-HTML files to work around https://bugs.debian.org/880542
+		<FilesMatch "(?<!\.html)\.gz$">
+			ForceType text/plain
+		</FilesMatch>
+
 		# To set the correct Content-Type (e.g. text/html).
 		RemoveType .gz
 		AddEncoding gzip gz