From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 14 Nov 2017 08:15:23 +0000 (+0100)
Subject: manpages: force content-type to text/plain for non-html .gz files
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=3b032c573323588681d3e30f144fb26ba84f3875;p=mirror%2Fdsa-puppet.git

manpages: force content-type to text/plain for non-html .gz files
---

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 8305ca6f7..c4983a922 100644
--- a/modules/roles/templates/static-mirroring/vhost/manpages.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/manpages.debian.org.erb
@@ -90,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