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=2988fbe32311b37812b059cd20e0e448ec5e9d66;hpb=b0f4517c6a00d27e50dd778fbd6316f1045c5b2a;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 2988fbe32..dad8375fe 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -142,8 +142,9 @@
    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>
@@ -314,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>