X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=dad8375fe199686a15c2348f83e9fe7a78ef6be8;hb=0578c547ab8910fbec58d3c9ac68780d3df316b8;hp=8be28f0280d2c52035bd8ee2fd5be83fb7674c79;hpb=1a5a75449b3bccf694a0f70bff7a294f990d9215;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 8be28f028..dad8375fe 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
@@ -122,6 +119,9 @@
    ServerAlias www.debian.fi
    ServerAlias debian.fi
 
+   ServerAlias www.debian.nl
+   ServerAlias debian.nl
+
    ServerAlias www.debian.com
    ServerAlias debian.com
 
@@ -142,14 +142,19 @@
    ServerAlias newwww.deb.at
 
    DocumentRoot <%= wwwdo_document_root %>/
+   LogFormat "0.0.0.0 - %u %{[%d/%b/%Y:00:00:00 %z]}t \"%r\" %>s %b \"%{Referer}i\" \"-\" %V" privacy+host
    ErrorLog /var/log/apache2/www-other.debian.org-error.log
-   CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
+   CustomLog /var/log/apache2/www-other.debian.org-access.log privacy+host
 </Macro>
 
 <Macro common-www.d.o>
    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
@@ -310,6 +315,6 @@
 
    Redirect permanent / https://www.debian.org/
 
-   Use common-debian-service-ssl www.debian.org
+   Use common-debian-service-ssl debian.org
    Use common-ssl-HSTS
 </VirtualHost>