Simplify setting grub_do_nopat

[mirror/dsa-puppet.git] / modules / roles / templates / security_mirror / security.debian.org.erb

diff --git a/modules/roles/templates/security_mirror/security.debian.org.erb b/modules/roles/templates/security_mirror/security.debian.org.erb
index d4fbe9d..95d067a 100644 (file)
--- a/modules/roles/templates/security_mirror/security.debian.org.erb
+++ b/modules/roles/templates/security_mirror/security.debian.org.erb
@@ -20,6 +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
@@ -29,7 +32,7 @@
    Use ftp-archive /srv/ftp.root/debian-security
 
    RewriteEngine on
-   RewriteRule ^/$      http://www.debian.org/security/
+   RewriteRule ^/$      https://www.debian.org/security/
 
    #RewriteCond %{HTTP:Fastly-Client-IP} !. [NV]
    #RewriteCond %{HTTP_USER_AGENT} "!Amazon CloudFront"
@@ -44,10 +47,6 @@
    #<% end %>
    #RewriteRule ^/debian-security/(pool/updates/main/l/linux/.*) http://security-cdn.debian.org/$1 [L,R=302]
 
-   # Possible values include: debug, info, notice, warn, error, crit,
-   # alert, emerg.
-   LogLevel warn
-
    CustomLog /var/log/apache2/security.debian.org-access.log privacy
    ServerSignature On
 </VirtualHost>