From: Julien Cristau <jcristau@debian.org>
Date: Thu, 4 Jan 2018 10:44:15 +0000 (+0100)
Subject: Redirect linux security updates to security-cdn on all mirrors
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=147fcb610d6a2f0e6884dab6f2cc23aff8e399c7;p=mirror%2Fdsa-puppet.git

Redirect linux security updates to security-cdn on all mirrors

Expecting an update for KPTI.
---

diff --git a/modules/roles/templates/security_mirror/security.debian.org.erb b/modules/roles/templates/security_mirror/security.debian.org.erb
index 163842052..a0c2ecc13 100644
--- a/modules/roles/templates/security_mirror/security.debian.org.erb
+++ b/modules/roles/templates/security_mirror/security.debian.org.erb
@@ -34,7 +34,6 @@
    RewriteEngine on
    RewriteRule ^/$      https://www.debian.org/security/
 
-   <% if @hostname == "setoguchi" %>
    RewriteCond %{HTTP:Fastly-Client-IP} !. [NV]
    RewriteCond %{HTTP_USER_AGENT} "!Amazon CloudFront"
    <% if scope.function_onion_global_service_hostname(['security.debian.org']) -%>
@@ -47,7 +46,6 @@
    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]
-   <% end %>
 
    CustomLog /var/log/apache2/security.debian.org-access.log privacy
    ServerSignature On