From b0f4517c6a00d27e50dd778fbd6316f1045c5b2a Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 29 Jul 2016 16:52:39 +0000 Subject: [PATCH] the other vhost --- modules/roles/templates/apache-www.debian.org.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb index 195be9f28..2988fbe32 100644 --- a/modules/roles/templates/apache-www.debian.org.erb +++ b/modules/roles/templates/apache-www.debian.org.erb @@ -91,10 +91,6 @@ ServerName debian.org ServerAdmin webmaster@debian.org - <% if scope.function_onion_global_service_hostname(['www.debian.org']) -%> - ServerAlias <%= scope.function_onion_global_service_hostname(['www.debian.org']) %> - <% end %> - ServerAlias www.at.debian.org ServerAlias www.au.debian.org ServerAlias www.bg.debian.org @@ -154,6 +150,10 @@ ServerName www.debian.org ServerAdmin webmaster@debian.org ServerAlias www-*.debian.org + <% if scope.function_onion_global_service_hostname(['www.debian.org']) -%> + ServerAlias <%= scope.function_onion_global_service_hostname(['www.debian.org']) %> + <% end %> + DocumentRoot <%= wwwdo_document_root %>/ # CacheNegotiatedDocs: By default, Apache sends Pragma: no-cache with each -- 2.20.1