From 7d296b65a7dd50c5701b7e6a3acbbfbdc968615a Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 24 Feb 2017 10:14:56 +0100 Subject: [PATCH] backend server aliases for archive, debug, debian, and security --- modules/roles/templates/apache-archive.debian.org.erb | 2 ++ modules/roles/templates/apache-debug.mirrors.debian.org.erb | 1 + modules/roles/templates/apache-ftp.debian.org.erb | 1 + modules/roles/templates/security_mirror/security.debian.org.erb | 1 + 4 files changed, 5 insertions(+) diff --git a/modules/roles/templates/apache-archive.debian.org.erb b/modules/roles/templates/apache-archive.debian.org.erb index 6dad6dc8f..84026e8e5 100644 --- a/modules/roles/templates/apache-archive.debian.org.erb +++ b/modules/roles/templates/apache-archive.debian.org.erb @@ -18,6 +18,8 @@ <% if scope.function_onion_global_service_hostname(['archive.debian.org']) -%> ServerAlias <%= scope.function_onion_global_service_hostname(['archive.debian.org']) %> <% end %> + ServerAlias archive.backend.mirrors.debian.org + ServerAlias *.archive.backend.mirrors.debian.org #RedirectMatch "^/$" /debian-archive/ DocumentRoot <%= archive_root %>/ diff --git a/modules/roles/templates/apache-debug.mirrors.debian.org.erb b/modules/roles/templates/apache-debug.mirrors.debian.org.erb index 811781736..b57df668c 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 ServerAlias *.debug.backend.mirrors.debian.org RedirectMatch "^/$" /debian-debug/ diff --git a/modules/roles/templates/apache-ftp.debian.org.erb b/modules/roles/templates/apache-ftp.debian.org.erb index f964c014a..339f93449 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 ServerAlias *.debian.backend.mirrors.debian.org RedirectMatch "^/$" /debian/ diff --git a/modules/roles/templates/security_mirror/security.debian.org.erb b/modules/roles/templates/security_mirror/security.debian.org.erb index 1f4cf6adc..ee839cd3d 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 ServerAlias *.security.backend.mirrors.debian.org ServerAlias security.anycast-test.mirrors.debian.org -- 2.20.1