add security-cdn{1,2} as ServerAliases for security.debian.org

[dsa-puppet.git] / modules / roles / files / security_mirror / security.debian.org

diff --git a/modules/roles/files/security_mirror/security.debian.org b/modules/roles/files/security_mirror/security.debian.org
index 70cc44f2e846652edf308188a78bbca4972c11e3..685162e3881ee86da402ae869c1cc56b8c30d059 100644 (file)
--- a/modules/roles/files/security_mirror/security.debian.org
+++ b/modules/roles/files/security_mirror/security.debian.org
@@ -20,8 +20,10 @@
    ServerAlias security.us.debian.org
    ServerAlias security.na.debian.org
    ServerAlias security.geo.debian.org
+   ServerAlias security-cdn.debian.org
+   ServerAlias security-cdn1.debian.org
+   ServerAlias security-cdn2.debian.org
    ServerAlias security-nagios.debian.org
-   ServerAlias security-fastly.debian.org
 
    ExpiresActive On
    ExpiresDefault "access plus 2 minutes"
@@ -29,10 +31,15 @@
    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>
+      <FilesMatch "\.(bz2|gz|deb|dsc|xz)$">
+         ExpiresDefault "access plus 1 month"
+         Header append Cache-Control "public"
+      </FilesMatch>
+   </Directory>
+
+   <Directory /org/security.debian.org/ftp/dists>
+      ExpiresDefault "access plus 1 seconds"
+      Header append Cache-Control "public"
    </Directory>
 
    RewriteEngine on
@@ -44,6 +51,6 @@
 
    CustomLog /var/log/apache2/security.debian.org-access.log privacy
    ServerSignature On
-
 </VirtualHost>
 
+# vim: set ts=3 sw=3 et: