Merge branch 'next'

[ipfire-2.x.git] / config / httpd / mod_log_config.conf

diff --git a/config/httpd/mod_log_config.conf b/config/httpd/mod_log_config.conf
index 89ad09a805697bed676c9c84a85d3f4a720aa917..94151c29d176ae1cd8e5ac4830e925aaad015b10 100644 (file)
--- a/config/httpd/mod_log_config.conf
+++ b/config/httpd/mod_log_config.conf
@@ -1,31 +1,2 @@
-#
-# The following directives define some format nicknames for use with
-# a CustomLog directive.
-#
-
-#
-#         Format string:                               Nickname:
-#
-LogFormat "%h %l %u %t \"%r\" %>s %b"          common
-LogFormat "%v %h %l %u %t \"%r\" %>s %b"               vhost_common
-LogFormat "%{Referer}i -> %U"                  referer
-LogFormat "%{User-agent}i"                             agent
-LogFormat "%h %l %u %t \"%r\" %>s %b \
-\"%{Referer}i\" \"%{User-Agent}i\""            combined
-LogFormat "%v %h %l %u %t \"%r\" %>s %b \
-\"%{Referer}i\" \"%{User-Agent}i\""            vhost_combined
-
-# To use %I and %O, you need to enable mod_logio
-<IfModule mod_logio.c>
-LogFormat "%h %l %u %t \"%r\" %>s %b \
-\"%{Referer}i\" \"%{User-Agent}i\" %I %O"              combinedio
-</IfModule>
-
-# Use one of these when you want a compact non-error SSL logfile on a virtual
-# host basis:
-<IfModule mod_ssl.c>
-Logformat "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \
-\"%r\" %b"                                             ssl_common
-Logformat "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \
-\"%r\" %b \"%{Referer}i\" \"%{User-Agent}i\""  ssl_combined
-</IfModule>
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""               combined
+LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""            vhost_combined