From 19c1152ce647a368f3cc870333c325e336a681a2 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sat, 7 Jul 2018 09:10:54 +0200 Subject: [PATCH] Use mod_cache_disk on security-tracker --- modules/roles/manifests/security_tracker.pp | 4 ++++ .../apache-security-tracker.debian.org.conf.erb | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/modules/roles/manifests/security_tracker.pp b/modules/roles/manifests/security_tracker.pp index d8d23a33d..ffd3261e3 100644 --- a/modules/roles/manifests/security_tracker.pp +++ b/modules/roles/manifests/security_tracker.pp @@ -3,6 +3,10 @@ class roles::security_tracker { include apache2::proxy_http include apache2::expires + apache2::module { 'mod_cache_disk': + ensure => present, + } + # security-tracker abusers # 66.170.99.1 20180706 excessive number of requests # 66.170.99.2 20180706 excessive number of requests 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 1f9cb0e23..f13ddd4a6 100644 --- a/modules/roles/templates/apache-security-tracker.debian.org.conf.erb +++ b/modules/roles/templates/apache-security-tracker.debian.org.conf.erb @@ -12,6 +12,15 @@ Use common-debian-service-https-redirect * security-tracker.debian.org UserDir disabled + + CacheEnable disk / + # Keep serving stale entities for up to 10 seconds while + # they're being refreshed + CacheLock on + CacheLockPath /var/lock/apache2/mod_cache + CacheLockMaxAge 10 + + LogLevel warn ErrorLog /var/log/apache2/security-tracker.debian.org-error.log CustomLog /var/log/apache2/security-tracker.debian.org-access.log privacyssl -- 2.20.1