From: Peter Palfrader Date: Thu, 23 Feb 2017 17:27:02 +0000 (+0100) Subject: add security.anycast-test server alias, do away with having both testing-anycast... X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2c9e56c30d184d40d77b48019269db96946b4377;p=mirror%2Fdsa-puppet.git add security.anycast-test server alias, do away with having both testing-anycast and anycast-test --- diff --git a/modules/roles/templates/apache-ftp.debian.org.erb b/modules/roles/templates/apache-ftp.debian.org.erb index 7525587d2..f964c014a 100644 --- a/modules/roles/templates/apache-ftp.debian.org.erb +++ b/modules/roles/templates/apache-ftp.debian.org.erb @@ -6,7 +6,7 @@ > ServerAdmin debian-admin@debian.org ServerName ftp.debian.org - ServerAlias debian.testing-anycast.mirrors.debian.org + ServerAlias debian.anycast-test.mirrors.debian.org <% if scope.function_onion_global_service_hostname(['ftp.debian.org']) -%> ServerAlias <%= scope.function_onion_global_service_hostname(['ftp.debian.org']) %> <% end %> diff --git a/modules/roles/templates/security_mirror/security.debian.org.erb b/modules/roles/templates/security_mirror/security.debian.org.erb index f28b49869..1f4cf6adc 100644 --- a/modules/roles/templates/security_mirror/security.debian.org.erb +++ b/modules/roles/templates/security_mirror/security.debian.org.erb @@ -21,6 +21,7 @@ ServerAlias <%= scope.function_onion_global_service_hostname(['security.debian.org']) %> <% end %> ServerAlias *.security.backend.mirrors.debian.org + ServerAlias security.anycast-test.mirrors.debian.org ExpiresActive On