Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet

diff --combined modules/roles/files/security_mirror/security.debian.org
index c6580c564cdcf736b9612a5ebb28524237da189d,a0ea6bc537833037bd56c825e223d150b27935fb..e52611152e01611ac98bf0133e9887ff5f197e30
--- 1/modules/roles/files/security_mirror/security.debian.org
--- 2/modules/roles/files/security_mirror/security.debian.org
+++ b/modules/roles/files/security_mirror/security.debian.org
@@@ -20,8 -20,8 +20,8 @@@
     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
 -   ServerAlias security-fastly.debian.org
  
     ExpiresActive On
     ExpiresDefault "access plus 2 minutes"
@@@ -35,6 -35,11 +35,11 @@@
         </FilesMatch>
     </Directory>
  
+    <Directory /org/security.debian.org/ftp/dists>
+        ExpiresDefault "access plus 1 seconds"
+        Header append Cache-Control "public"
+    </Directory>
+ 
     RewriteEngine on
     RewriteRule ^/$      http://www.debian.org/security/