From: Julien Cristau <jcristau@debian.org>
Date: Wed, 21 Jun 2017 08:51:09 +0000 (+0200)
Subject: Revert "redirect linux updates to security-cdn"
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=80f6bb8afd0ea353c93089dcafa691428f002e77;p=mirror%2Fdsa-puppet.git

Revert "redirect linux updates to security-cdn"

This reverts commit e0525b0198da806181c009520758274cf1d05995.
---

diff --git a/modules/roles/templates/security_mirror/security.debian.org.erb b/modules/roles/templates/security_mirror/security.debian.org.erb
index a0c2ecc13..95d067ad6 100644
--- a/modules/roles/templates/security_mirror/security.debian.org.erb
+++ b/modules/roles/templates/security_mirror/security.debian.org.erb
@@ -34,18 +34,18 @@
    RewriteEngine on
    RewriteRule ^/$      https://www.debian.org/security/
 
-   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 ^/(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]
+   #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 ^/(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]
 
    CustomLog /var/log/apache2/security.debian.org-access.log privacy
    ServerSignature On