From: Julien Cristau <jcristau@debian.org>
Date: Wed, 27 Jul 2016 17:20:55 +0000 (+0200)
Subject: Use the ftp-archive apache macro for security mirrors
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2393cf04055450d377bddf76788629bcdefa60b0;p=mirror%2Fdsa-puppet.git

Use the ftp-archive apache macro for security mirrors

Signed-off-by: Julien Cristau <jcristau@debian.org>
---

diff --git a/modules/roles/templates/security_mirror/security.debian.org.erb b/modules/roles/templates/security_mirror/security.debian.org.erb
index 64f385134..5294a1fa6 100644
--- a/modules/roles/templates/security_mirror/security.debian.org.erb
+++ b/modules/roles/templates/security_mirror/security.debian.org.erb
@@ -32,18 +32,7 @@
    ExpiresDefault "access plus 2 minutes"
 
    Alias /debian-security /srv/ftp.root/debian-security
-
-   <Directory /srv/ftp.root/debian-security/pool>
-      <FilesMatch "\.(bz2|gz|deb|dsc|xz)$">
-         ExpiresDefault "access plus 1 month"
-         Header append Cache-Control "public"
-      </FilesMatch>
-   </Directory>
-
-   <Directory /srv/ftp.root/debian-security/dists>
-      ExpiresDefault "access plus 1 seconds"
-      Header append Cache-Control "public"
-   </Directory>
+   Use ftp-archive /srv/ftp.root/debian-security
 
    RewriteEngine on
    RewriteRule ^/$      http://www.debian.org/security/