X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fsecurity_mirror%2Fsecurity.debian.org;h=c6580c564cdcf736b9612a5ebb28524237da189d;hb=fb79d6c2afc3feade37b8ddf0c3405d6fa4eead9;hp=0f77652dbd0e708e5fb2710755d5a912fe270a39;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=dsa-puppet.git

diff --git a/modules/roles/files/security_mirror/security.debian.org b/modules/roles/files/security_mirror/security.debian.org
index 0f77652d..c6580c56 100644
--- a/modules/roles/files/security_mirror/security.debian.org
+++ b/modules/roles/files/security_mirror/security.debian.org
@@ -20,10 +20,21 @@
    ServerAlias security.us.debian.org
    ServerAlias security.na.debian.org
    ServerAlias security.geo.debian.org
+   ServerAlias security-cdn.debian.org
    ServerAlias security-nagios.debian.org
 
+   ExpiresActive On
+   ExpiresDefault "access plus 2 minutes"
+
    Alias /debian-security /org/security.debian.org/ftp
 
+   <Directory /org/security.debian.org/ftp/pool>
+       <FilesMatch "\.(bz2|gz|deb|dsc|xz)$">
+           ExpiresDefault "access plus 1 month"
+           Header append Cache-Control "public"
+       </FilesMatch>
+   </Directory>
+
    RewriteEngine on
    RewriteRule ^/$      http://www.debian.org/security/
 
@@ -31,7 +42,7 @@
    # alert, emerg.
    LogLevel warn
 
-   CustomLog /var/log/apache2/security.debian.org-access.log combined
+   CustomLog /var/log/apache2/security.debian.org-access.log privacy
    ServerSignature On
 
 </VirtualHost>