X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=2988fbe32311b37812b059cd20e0e448ec5e9d66;hb=1f1aa0ea7fee69c0fa68cd1150e5ccbbe25f1ead;hp=195be9f28986f7dace881f44f88effe88a3f7dff;hpb=7428fc1d6b4b7a740d54cbbf456d5f6306572e3b;p=mirror%2Fdsa-puppet.git

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