X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=2988fbe32311b37812b059cd20e0e448ec5e9d66;hb=b0f4517c6a00d27e50dd778fbd6316f1045c5b2a;hp=3442b9fce1774deec2232493bb609ec3f2a3a5e4;hpb=00eb81aa2d0510546b0e335371d7175c4d10a680;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 3442b9fce..2988fbe32 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -10,10 +10,7 @@
   # Make sure that the srm.conf directive is commented out.
   AddDefaultCharSet Off
   AllowOverride AuthConfig FileInfo
-  <% if @lsbmajdistrelease > '7' -%>
-    Require all granted
-  <% end -%>
-
+  Require all granted
 
   # Serve icons as image/x-icon
   AddType image/x-icon .ico
@@ -153,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