From 1e38dc4254f1e84112c54ddc45495f153108000c Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Fri, 29 Sep 2017 11:48:31 +0200 Subject: [PATCH] Revert "redirect linux updates to security-cdn" This reverts commit 34eacf56eba8289174e139dee14af8d926723115. --- .../security_mirror/security.debian.org.erb | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) 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 -- 2.20.1