diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2018-06-20 10:41:23 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2018-06-20 10:41:23 -0300 |
| commit | a06881cafbf9d0c7f35e3d7c089f4dfc149d20db (patch) | |
| tree | d192dc0e7e0fd65e6bea4614397bb64ab7eb4919 | |
| parent | 82ffa7457f81ea1137f8e9f319c4df72c10109fa (diff) | |
| download | puppet-apache-a06881cafbf9d0c7f35e3d7c089f4dfc149d20db.tar.gz puppet-apache-a06881cafbf9d0c7f35e3d7c089f4dfc149d20db.tar.bz2 | |
Use default LogFormat definitions, plus an anonymized one
| -rw-r--r-- | templates/apache2.conf.jessie.erb | 6 | ||||
| -rw-r--r-- | templates/apache2.conf.stretch.erb | 6 | ||||
| -rw-r--r-- | templates/apache2.conf.trusty.erb | 6 | ||||
| -rw-r--r-- | templates/apache2.conf.wheezy.erb | 6 | ||||
| -rw-r--r-- | templates/apache2.conf.xenial.erb | 6 |
5 files changed, 20 insertions, 10 deletions
diff --git a/templates/apache2.conf.jessie.erb b/templates/apache2.conf.jessie.erb index 5484297..b358b22 100644 --- 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 5484297..b358b22 100644 --- 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 29140de..820b376 100644 --- 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 b064e5d..8d9a353 100644 --- 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 5484297..b358b22 100644 --- 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" # |