X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Flintian.debian.org.erb;h=c52b100a8f0e5e04cf0df3feca137c5167d9a4d4;hb=198c083b149dd42f358684d2247d276ce54f6dfb;hp=12a4f16529b1313f292e1a751ed06496b3373245;hpb=c02bca2103152bc3054ba474242a33f61b02dfd9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb b/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
index 12a4f1652..c52b100a8 100644
--- a/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
@@ -18,7 +18,12 @@ Use common-dsa-vhost-https-redirect lintian.debian.org
 	AddDefaultCharset utf-8
 
 	<Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur>
-		# These two lines makes apache serve "lintian.log.gz" as a text/plain with encoding gzip
+		<% if @lsbmajdistrelease > '7' -%>
+			Require all granted
+		<% end -%>
+
+		# These three lines makes apache serve
+		# "lintian.log.gz" as a text/plain with encoding gzip
 		# making it easier to view the log in the browser.
 		RemoveType .gz
 		AddEncoding x-gzip .gz
@@ -30,12 +35,6 @@ Use common-dsa-vhost-https-redirect lintian.debian.org
 		</IfModule>
 	</Directory>
 
-	<Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur/graphs>
-		# Cache graphs for an hour (Technically, a "expires" of "24h after last mod"
-		# might be better, but oh well)
-		Header set Cache-Control "max-age=3600, must-revalidate, public"
-	</Directory>
-
 	<Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur/resources>
 		# Cache these for a year (3600 * 24 * 365.25)
 		# Files in here will change name if their content change