From: Julien Cristau <jcristau@debian.org>
Date: Fri, 23 Feb 2018 14:58:23 +0000 (+0100)
Subject: Make security -> security-cdn redirect global, not just for the linux package
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=d8b6b760a99f36fc6bf6088b8e998c1d67d46ab6;hp=bbaef03179a8a061ba588c934307b1afb541bd50;p=mirror%2Fdsa-puppet.git

Make security -> security-cdn redirect global, not just for the linux package
---

diff --git a/modules/roles/templates/security_mirror/security.debian.org.erb b/modules/roles/templates/security_mirror/security.debian.org.erb
index 3d79591dd..52e7950b9 100644
--- a/modules/roles/templates/security_mirror/security.debian.org.erb
+++ b/modules/roles/templates/security_mirror/security.debian.org.erb
@@ -44,13 +44,7 @@
    <% if scope.function_onion_global_service_hostname(['security.debian.org']) -%>
    RewriteCond %{HTTP_HOST} "!=<%= scope.function_onion_global_service_hostname(['security.debian.org']) %>"
    <% end %>
-   RewriteRule ^/(pool/updates/main/l/linux/.*) http://security-cdn.debian.org/$1 [L,R=302]
-   RewriteCond %{HTTP:Fastly-Client-IP} !. [NV]
-   RewriteCond %{HTTP_USER_AGENT} "!Amazon CloudFront"
-   <% if scope.function_onion_global_service_hostname(['security.debian.org']) -%>
-   RewriteCond %{HTTP_HOST} "!=<%= scope.function_onion_global_service_hostname(['security.debian.org']) %>"
-   <% end %>
-   RewriteRule ^/debian-security/(pool/updates/main/l/linux/.*) http://security-cdn.debian.org/$1 [L,R=302]
+   RewriteRule ^/(.*) http://security-cdn.debian.org/$1 [L,R=302]
 
    CustomLog /var/log/apache2/security.debian.org-access.log privacy
    ServerSignature On