# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1491160153 -3600
# Node ID d2b4750e843aceb56d13a40e8b1839367333e6db
# Parent  0d829df9cd39c0a0ca0444020fa47bb882390fb5
Add custom log format - combined plus requested domain

This helps by logging which domain people hit and got redirected by
without having per-domain logs

diff -r 0d829df9cd39 -r d2b4750e843a modules/website/manifests/http.pp
--- a/modules/website/manifests/http.pp	Sat Apr 01 10:54:09 2017 +0100
+++ b/modules/website/manifests/http.pp	Sun Apr 02 20:09:13 2017 +0100
@@ -35,6 +35,7 @@
     custom_fragment => $custom_fragment,
     logroot         => '/var/log/apache/',
     access_log_file => "access_${logpart}.log",
+    access_log_format => "%h %l %u %t \\\"%r\\\" %>s %b \\\"%{Referer}i\\\" \\\"%{User-agent}i\\\" %{Host}i",
     serveraliases   => $serveraliases,
     ensure          => $ensure,
   }
diff -r 0d829df9cd39 -r d2b4750e843a modules/website/manifests/https.pp
--- a/modules/website/manifests/https.pp	Sat Apr 01 10:54:09 2017 +0100
+++ b/modules/website/manifests/https.pp	Sun Apr 02 20:09:13 2017 +0100
@@ -141,6 +141,7 @@
     custom_fragment => $custom_conf,
     logroot         => '/var/log/apache/',
     access_log_file => "access_${logpart}.log",
+    access_log_format => "%h %l %u %t \\\"%r\\\" %>s %b \\\"%{Referer}i\\\" \\\"%{User-agent}i\\\" %{Host}i",
     error_log_file  => "error_${logpart}.log",
     serveraliases   => $serveraliases,
     ssl             => true,
@@ -159,6 +160,7 @@
     serveraliases   => $serveraliases,
     logroot         => '/var/log/apache/',
     access_log_file => "access_${logpart}_nossl.log",
+    access_log_format => "%h %l %u %t \\\"%r\\\" %>s %b \\\"%{Referer}i\\\" \\\"%{User-agent}i\\\" %{Host}i",
     error_log_file  => "error_${logpart}_nossl.log",
   }
 }
diff -r 0d829df9cd39 -r d2b4750e843a modules/website/manifests/https/redir.pp
--- a/modules/website/manifests/https/redir.pp	Sat Apr 01 10:54:09 2017 +0100
+++ b/modules/website/manifests/https/redir.pp	Sun Apr 02 20:09:13 2017 +0100
@@ -117,6 +117,7 @@
     custom_fragment => $custom_conf,
     logroot         => '/var/log/apache/',
     access_log_file => "access_${logpart}${log_extra}.log",
+    access_log_format => "%h %l %u %t \\\"%r\\\" %>s %b \\\"%{Referer}i\\\" \\\"%{User-agent}i\\\" %{Host}i",
     error_log_file  => "error_${logpart}${log_extra}.log",
     serveraliases   => $serveraliases,
     ssl             => true,
@@ -137,6 +138,7 @@
     serveraliases   => $serveraliases,
     logroot         => '/var/log/apache/',
     access_log_file => "access_${logpart}${log_extra}_nossl.log",
+    access_log_format => "%h %l %u %t \\\"%r\\\" %>s %b \\\"%{Referer}i\\\" \\\"%{User-agent}i\\\" %{Host}i",
     error_log_file  => "error_${logpart}${log_extra}_nossl.log",
   }
 }