summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-12-11 17:10:59 -0200
committerSilvio Rhatto <rhatto@riseup.net>2017-12-11 17:10:59 -0200
commitf449a45cd00ffcba2c0bbb116c2b88c761999964 (patch)
tree3cebe54dbef719ec2ad3eb0b4e91cd84cec208a5
parentb39ed3d7adc85620daaf10a34714476f0547bedf (diff)
downloadpuppet-apache-f449a45cd00ffcba2c0bbb116c2b88c761999964.tar.gz
puppet-apache-f449a45cd00ffcba2c0bbb116c2b88c761999964.tar.bz2
Uncomment LogFormatfeature/logs
-rw-r--r--templates/apache2.conf.jessie.erb8
-rw-r--r--templates/apache2.conf.stretch.erb8
-rw-r--r--templates/apache2.conf.trusty.erb8
-rw-r--r--templates/apache2.conf.wheezy.erb8
-rw-r--r--templates/apache2.conf.xenial.erb8
5 files changed, 20 insertions, 20 deletions
diff --git a/templates/apache2.conf.jessie.erb b/templates/apache2.conf.jessie.erb
index 9e5cde6..5484297 100644
--- a/templates/apache2.conf.jessie.erb
+++ b/templates/apache2.conf.jessie.erb
@@ -198,10 +198,10 @@ 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 "%{Referer}i -> %U" referer
-#LogFormat "%{User-agent}i" agent
+LogFormat " %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat " %l %u %t \"%r\" %>s %b" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
LogFormat "%t \"%r\" %>s %b"
#
diff --git a/templates/apache2.conf.stretch.erb b/templates/apache2.conf.stretch.erb
index 9e5cde6..5484297 100644
--- a/templates/apache2.conf.stretch.erb
+++ b/templates/apache2.conf.stretch.erb
@@ -198,10 +198,10 @@ 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 "%{Referer}i -> %U" referer
-#LogFormat "%{User-agent}i" agent
+LogFormat " %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat " %l %u %t \"%r\" %>s %b" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
LogFormat "%t \"%r\" %>s %b"
#
diff --git a/templates/apache2.conf.trusty.erb b/templates/apache2.conf.trusty.erb
index 5886ac2..29140de 100644
--- a/templates/apache2.conf.trusty.erb
+++ b/templates/apache2.conf.trusty.erb
@@ -198,10 +198,10 @@ 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 "%{Referer}i -> %U" referer
-#LogFormat "%{User-agent}i" agent
+LogFormat " %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat " %l %u %t \"%r\" %>s %b" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
LogFormat "%t \"%r\" %>s %b"
#
diff --git a/templates/apache2.conf.wheezy.erb b/templates/apache2.conf.wheezy.erb
index 4e9c68c..b064e5d 100644
--- a/templates/apache2.conf.wheezy.erb
+++ b/templates/apache2.conf.wheezy.erb
@@ -198,10 +198,10 @@ 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 "%{Referer}i -> %U" referer
-#LogFormat "%{User-agent}i" agent
+LogFormat " %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat " %l %u %t \"%r\" %>s %b" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
LogFormat "%t \"%r\" %>s %b"
#
diff --git a/templates/apache2.conf.xenial.erb b/templates/apache2.conf.xenial.erb
index 9e5cde6..5484297 100644
--- a/templates/apache2.conf.xenial.erb
+++ b/templates/apache2.conf.xenial.erb
@@ -198,10 +198,10 @@ 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 "%{Referer}i -> %U" referer
-#LogFormat "%{User-agent}i" agent
+LogFormat " %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat " %l %u %t \"%r\" %>s %b" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
LogFormat "%t \"%r\" %>s %b"
#