From d1e3825f8e98721af5ca75b35bedb0bb80aad263 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 28 Oct 2017 10:43:34 +0200
Subject: [PATCH] Split common-www.d.o into common-www.d.o and -inner

---
 .../roles/templates/apache-www.debian.org.erb  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index 9f07c0dbb..a83717a9b 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -123,14 +123,8 @@
    CustomLog /var/log/apache2/www-other.debian.org-access.log privacy+host
 </Macro>
 
-<Macro common-www.d.o>
-   ServerName www.debian.org
+<Macro common-www.d.o-inner>
    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
@@ -259,6 +253,16 @@
    RewriteRule ^/devel/hamradio(.*)$ /blends/hamradio$1 [R=301,L]
 </Macro>
 
+<Macro common-www.d.o>
+   ServerName www.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 %>
+
+   Use common-www.d.o-inner
+</Macro>
+
 
 <VirtualHost <%= @vhost_listen %> >
    ErrorLog /var/log/apache2/www.debian.org-error.log
-- 
2.20.1