Change /org to /srv in security rsync.conf

[mirror/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 28ec653..3507a08 100644 (file)
--- 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
@@ -20,10 +20,28 @@
    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
 
+   ExpiresActive On
+   ExpiresDefault "access plus 2 minutes"
+
    Alias /debian-security /org/security.debian.org/ftp
 
+   <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 /srv/ftp.root/debian-security/dists>
+      ExpiresDefault "access plus 1 seconds"
+      Header append Cache-Control "public"
+   </Directory>
+
    RewriteEngine on
    RewriteRule ^/$      http://www.debian.org/security/
 
@@ -33,6 +51,6 @@
 
    CustomLog /var/log/apache2/security.debian.org-access.log privacy
    ServerSignature On
-
 </VirtualHost>
 
+# vim: set ts=3 sw=3 et: