From: Julien Cristau <jcristau@debian.org>
Date: Fri, 2 Nov 2018 12:19:18 +0000 (+0100)
Subject: Disable mod_disk_cache on security-tracker
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=bd7d026dba49c5698d3c5c76e4c7a6b99d40d213;p=mirror%2Fdsa-puppet.git

Disable mod_disk_cache on security-tracker
---

diff --git a/modules/roles/manifests/security_tracker.pp b/modules/roles/manifests/security_tracker.pp
index 8e60d7c1d..1e93e29e8 100644
--- a/modules/roles/manifests/security_tracker.pp
+++ b/modules/roles/manifests/security_tracker.pp
@@ -4,7 +4,7 @@ class roles::security_tracker {
 	include apache2::expires
 
 	apache2::module { 'cache_disk':
-		ensure => present,
+		ensure => absent,
 	}
 
 	# security-tracker abusers
diff --git a/modules/roles/templates/apache-security-tracker.debian.org.conf.erb b/modules/roles/templates/apache-security-tracker.debian.org.conf.erb
index 6c7604ec3..1f9cb0e23 100644
--- a/modules/roles/templates/apache-security-tracker.debian.org.conf.erb
+++ b/modules/roles/templates/apache-security-tracker.debian.org.conf.erb
@@ -12,16 +12,6 @@ Use common-debian-service-https-redirect * security-tracker.debian.org
 		UserDir disabled
 	</IfModule>
 
-	<IfModule mod_cache_disk.c>
-		CacheEnable disk /
-		CacheMinExpire 600
-		# Keep serving stale entities for up to 10 seconds while
-		# they're being refreshed
-		CacheLock on
-		CacheLockPath /var/lock/apache2/mod_cache
-		CacheLockMaxAge 10
-	</IfModule>
-
 	LogLevel warn
 	ErrorLog /var/log/apache2/security-tracker.debian.org-error.log
 	CustomLog /var/log/apache2/security-tracker.debian.org-access.log privacyssl