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=e0525b0198da806181c009520758274cf1d05995;hp=f28b4986944ac98bcce04f389f3bbdb757b386c0;hpb=be4d8007860aff43c5da575d18a66c1d0abafe6a;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 f28b49869..a0c2ecc13 100644
--- a/modules/roles/templates/security_mirror/security.debian.org.erb
+++ b/modules/roles/templates/security_mirror/security.debian.org.erb
@@ -20,7 +20,9 @@
    <% if scope.function_onion_global_service_hostname(['security.debian.org']) -%>
    ServerAlias <%= scope.function_onion_global_service_hostname(['security.debian.org']) %>
    <% end %>
+   ServerAlias security.backend.mirrors.debian.org
    ServerAlias *.security.backend.mirrors.debian.org
+   ServerAlias security.anycast-test.mirrors.debian.org
 
 
    ExpiresActive On
@@ -30,20 +32,20 @@
    Use ftp-archive /srv/ftp.root/debian-security
 
    RewriteEngine on
-   RewriteRule ^/$      http://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]
+   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]
 
    CustomLog /var/log/apache2/security.debian.org-access.log privacy
    ServerSignature On