From: Peter Palfrader Date: Thu, 23 Feb 2017 15:59:54 +0000 (+0100) Subject: Add server alias for $location.$archive.backend.mirrors.debian.org X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=be4d8007860aff43c5da575d18a66c1d0abafe6a;p=mirror%2Fdsa-puppet.git Add server alias for $location.$archive.backend.mirrors.debian.org --- diff --git a/modules/roles/templates/apache-debug.mirrors.debian.org.erb b/modules/roles/templates/apache-debug.mirrors.debian.org.erb index bcc57d6bd..811781736 100644 --- a/modules/roles/templates/apache-debug.mirrors.debian.org.erb +++ b/modules/roles/templates/apache-debug.mirrors.debian.org.erb @@ -9,6 +9,7 @@ <% if scope.function_onion_global_service_hostname(['debug.mirrors.debian.org']) -%> ServerAlias <%= scope.function_onion_global_service_hostname(['debug.mirrors.debian.org']) %> <% end %> + ServerAlias *.debug.backend.mirrors.debian.org RedirectMatch "^/$" /debian-debug/ Alias /debian-debug /srv/mirrors/debian-debug diff --git a/modules/roles/templates/apache-ftp.debian.org.erb b/modules/roles/templates/apache-ftp.debian.org.erb index 972603db4..7525587d2 100644 --- a/modules/roles/templates/apache-ftp.debian.org.erb +++ b/modules/roles/templates/apache-ftp.debian.org.erb @@ -10,6 +10,7 @@ <% if scope.function_onion_global_service_hostname(['ftp.debian.org']) -%> ServerAlias <%= scope.function_onion_global_service_hostname(['ftp.debian.org']) %> <% end %> + ServerAlias *.debian.backend.mirrors.debian.org RedirectMatch "^/$" /debian/ Alias /debian/ <%= archive_root %>/ diff --git a/modules/roles/templates/security_mirror/security.debian.org.erb b/modules/roles/templates/security_mirror/security.debian.org.erb index 130dca981..f28b49869 100644 --- a/modules/roles/templates/security_mirror/security.debian.org.erb +++ b/modules/roles/templates/security_mirror/security.debian.org.erb @@ -20,6 +20,7 @@ <% 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 ExpiresActive On