X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fsecurity_mirror%2Fsecurity.debian.org.erb;h=a0c2ecc13a9944b3f1c7da90c1b37094f1960e04;hb=34eacf56eba8289174e139dee14af8d926723115;hp=95d067ad65db65d454cb24845b56c214a91c6641;hpb=3b439e9aa0cd3647f96ba298d3b07bccb7e4a511;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/templates/security_mirror/security.debian.org.erb b/modules/roles/templates/security_mirror/security.debian.org.erb index 95d067ad6..a0c2ecc13 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