www: Split out onion hostname

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index a83717a..a26b91e 100644 (file)
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -256,9 +256,6 @@
 <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>
@@ -280,6 +277,17 @@
    Use common-ssl-HSTS
 </VirtualHost>
 
+<% if scope.function_onion_global_service_hostname(['www.debian.org']) -%>
+<VirtualHost <%= @vhost_listen %> >
+   ErrorLog /var/log/apache2/www.debian.org-error.log
+   CustomLog /var/log/apache2/www.debian.org-access.log privacy
+
+   ServerName <%= scope.function_onion_global_service_hostname(['www.debian.org']) %>
+
+   Use common-www.d.o-inner
+</VirtualHost>
+<% end %>
+
 
 # www other
 ###########