From 04bb6dbf20fb85a8e9b0df95d9cbfdb01871a582 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Wed, 3 Jan 2018 18:16:25 +0100 Subject: [PATCH] Do the linux redirect to security-cdn dance on setoguchi --- .../security_mirror/security.debian.org.erb | 26 ++++++++++--------- 1 file changed, 14 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 95d067ad6..163842052 100644 --- a/modules/roles/templates/security_mirror/security.debian.org.erb +++ b/modules/roles/templates/security_mirror/security.debian.org.erb @@ -34,18 +34,20 @@ 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] + <% 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']) -%> + 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] + <% end %> CustomLog /var/log/apache2/security.debian.org-access.log privacy ServerSignature On -- 2.20.1