Use default LogFormat definitions, plus an anonymized one

diff --git a/templates/apache2.conf.jessie.erb b/templates/apache2.conf.jessie.erb
index 5484297b53858dd647d65496f84e879365234311..b358b22893b6760b312732ab33e587c8bcd0e5fd 100644 (file)
--- a/templates/apache2.conf.jessie.erb
+++ b/templates/apache2.conf.jessie.erb
@@ -198,10 +198,12 @@ Include /etc/apache2/conf.d/*
 # The following directives define some format nicknames for use with
 # a CustomLog directive (see below).
 #
-LogFormat " %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat " %l %u %t \"%r\" %>s %b" common
+LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %O" common
 LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
+LogFormat "%t \"%r\"  %>s %b" anon
 LogFormat "%t \"%r\"  %>s %b"
 
 #

diff --git a/templates/apache2.conf.stretch.erb b/templates/apache2.conf.stretch.erb
index 5484297b53858dd647d65496f84e879365234311..b358b22893b6760b312732ab33e587c8bcd0e5fd 100644 (file)
--- a/templates/apache2.conf.stretch.erb
+++ b/templates/apache2.conf.stretch.erb
@@ -198,10 +198,12 @@ Include /etc/apache2/conf.d/*
 # The following directives define some format nicknames for use with
 # a CustomLog directive (see below).
 #
-LogFormat " %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat " %l %u %t \"%r\" %>s %b" common
+LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %O" common
 LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
+LogFormat "%t \"%r\"  %>s %b" anon
 LogFormat "%t \"%r\"  %>s %b"
 
 #

diff --git a/templates/apache2.conf.trusty.erb b/templates/apache2.conf.trusty.erb
index 29140de10ca4662d1fad70de7613c317545d6bc6..820b376a680cb2b0c4b18d77735687c529c49491 100644 (file)
--- a/templates/apache2.conf.trusty.erb
+++ b/templates/apache2.conf.trusty.erb
@@ -198,10 +198,12 @@ Include /etc/apache2/conf.d/*
 # The following directives define some format nicknames for use with
 # a CustomLog directive (see below).
 #
-LogFormat " %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat " %l %u %t \"%r\" %>s %b" common
+LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %O" common
 LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
+LogFormat "%t \"%r\"  %>s %b" anon
 LogFormat "%t \"%r\"  %>s %b"
 
 #

diff --git a/templates/apache2.conf.wheezy.erb b/templates/apache2.conf.wheezy.erb
index b064e5d892eaee06998bce7b11c4bbf67463d607..8d9a35365fbb2d920056a39bacde9152172cd928 100644 (file)
--- a/templates/apache2.conf.wheezy.erb
+++ b/templates/apache2.conf.wheezy.erb
@@ -198,10 +198,12 @@ Include /etc/apache2/conf.d/
 # The following directives define some format nicknames for use with
 # a CustomLog directive (see below).
 #
-LogFormat " %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat " %l %u %t \"%r\" %>s %b" common
+LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %O" common
 LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
+LogFormat "%t \"%r\"  %>s %b" anon
 LogFormat "%t \"%r\"  %>s %b"
 
 #

diff --git a/templates/apache2.conf.xenial.erb b/templates/apache2.conf.xenial.erb
index 5484297b53858dd647d65496f84e879365234311..b358b22893b6760b312732ab33e587c8bcd0e5fd 100644 (file)
--- a/templates/apache2.conf.xenial.erb
+++ b/templates/apache2.conf.xenial.erb
@@ -198,10 +198,12 @@ Include /etc/apache2/conf.d/*
 # The following directives define some format nicknames for use with
 # a CustomLog directive (see below).
 #
-LogFormat " %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat " %l %u %t \"%r\" %>s %b" common
+LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %O" common
 LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
+LogFormat "%t \"%r\"  %>s %b" anon
 LogFormat "%t \"%r\"  %>s %b"
 
 #