X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fsecurity_mirror%2Fsecurity.debian.org;h=5299f36aa6b409417365d8ab8c2ea03b59cbacd3;hb=5a8b3ee0b8fbf27d1106dd2defd757cd412f2453;hp=e52611152e01611ac98bf0133e9887ff5f197e30;hpb=adeba5f271ffdf3638fa4ec3a7ae025dca24a0e8;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 e52611152..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,23 +21,25 @@
    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>
-       <FilesMatch "\.(bz2|gz|deb|dsc|xz)$">
-           ExpiresDefault "access plus 1 month"
-           Header append Cache-Control "public"
-       </FilesMatch>
+   <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>
-       ExpiresDefault "access plus 1 seconds"
-       Header append Cache-Control "public"
+   <Directory /srv/ftp.root/debian-security/dists>
+      ExpiresDefault "access plus 1 seconds"
+      Header append Cache-Control "public"
    </Directory>
 
    RewriteEngine on
@@ -49,6 +51,6 @@
 
    CustomLog /var/log/apache2/security.debian.org-access.log privacy
    ServerSignature On
-
 </VirtualHost>
 
+# vim: set ts=3 sw=3 et: