X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fsecurity_mirror%2Fsecurity.debian.org.erb;h=d4be2a44094868276cd1124c5e2c91da0999923a;hb=a245784ed5c12aedc4ac3e19bac9b216daee2571;hp=5299f36aa6b409417365d8ab8c2ea03b59cbacd3;hpb=28d845a146f1b7259134059db896e8ff8bcc32d1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/security_mirror/security.debian.org.erb b/modules/roles/templates/security_mirror/security.debian.org.erb
index 5299f36aa..d4be2a440 100644
--- a/modules/roles/templates/security_mirror/security.debian.org.erb
+++ b/modules/roles/templates/security_mirror/security.debian.org.erb
@@ -8,6 +8,7 @@
    Options +FollowSymLinks
    Options +Indexes
    FileETag MTime Size
+   Require all granted
 </Directory>
 
 <VirtualHost *:80>
@@ -24,27 +25,25 @@
    ServerAlias security-cdn1.debian.org
    ServerAlias security-cdn2.debian.org
    ServerAlias security-nagios.debian.org
+   <% if scope.function_onion_global_service_hostname(['security.debian.org']) -%>
+   ServerAlias <%= scope.function_onion_global_service_hostname(['security.debian.org']) %>
+   <% end %>
+
 
    ExpiresActive On
    ExpiresDefault "access plus 2 minutes"
 
    Alias /debian-security /srv/ftp.root/debian-security
-
-   <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>
+   Use ftp-archive /srv/ftp.root/debian-security
 
    RewriteEngine on
    RewriteRule ^/$      http://www.debian.org/security/
 
+   RewriteCond %{HTTP:Fastly-Client-IP} !. [NV]
+   RewriteRule ^/(pool/updates/main/l/linux/.*) http://security-cdn.debian.org/$1 [L,R=302]
+   RewriteCond %{HTTP:Fastly-Client-IP} !. [NV]
+   RewriteRule ^/debian-security/(pool/updates/main/l/linux/.*) http://security-cdn.debian.org/$1 [L,R=302]
+
    # Possible values include: debug, info, notice, warn, error, crit,
    # alert, emerg.
    LogLevel warn