X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fsecurity_mirror%2Fsecurity.debian.org;h=5299f36aa6b409417365d8ab8c2ea03b59cbacd3;hb=2b56671e43a6347bfad180955c5bb14aa5c03d0d;hp=bc54f5e0f455233d30ab264181dabf61efb11bcb;hpb=16f6c01700c35252542a31c7d739a0ec5a984e92;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/files/security_mirror/security.debian.org b/modules/roles/files/security_mirror/security.debian.org
index bc54f5e0f..5299f36aa 100644
--- a/modules/roles/files/security_mirror/security.debian.org
+++ b/modules/roles/files/security_mirror/security.debian.org
@@ -3,7 +3,7 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<Directory /org/security.debian.org/ftp>
+<Directory /srv/ftp.root/debian-security>
    IndexOptions NameWidth=* +SuppressDescription
    Options +FollowSymLinks
    Options +Indexes
@@ -12,7 +12,7 @@
 
 <VirtualHost *:80>
    ServerAdmin debian-admin@debian.org
-   DocumentRoot /org/security.debian.org/ftp
+   DocumentRoot /srv/ftp.root/debian-security
    ServerPath /debian-security
    ServerName security.debian.org
    ServerAlias security.ipv6.debian.org
@@ -21,21 +21,23 @@
    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
 
    ExpiresActive On
    ExpiresDefault "access plus 2 minutes"
 
-   Alias /debian-security /org/security.debian.org/ftp
+   Alias /debian-security /srv/ftp.root/debian-security
 
-   <Directory /org/security.debian.org/ftp/pool>
+   <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 /org/security.debian.org/ftp/dists>
+   <Directory /srv/ftp.root/debian-security/dists>
       ExpiresDefault "access plus 1 seconds"
       Header append Cache-Control "public"
    </Directory>