Jeremyb has uploaded a new change for review. https://gerrit.wikimedia.org/r/162541
Change subject: import LogFormat s from apache2 package ...................................................................... import LogFormat s from apache2 package from apache2.conf as installed by the package on trusty md5 gets google hits for debian BTS so must not have been modified by Ubuntu RT: 8419 Change-Id: Ida8c362340025d75f6947f13d85865c037e7d4d0 --- M modules/mediawiki/files/apache/apache2.conf 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/41/162541/1 diff --git a/modules/mediawiki/files/apache/apache2.conf b/modules/mediawiki/files/apache/apache2.conf index 95f6337..b04b754 100644 --- a/modules/mediawiki/files/apache/apache2.conf +++ b/modules/mediawiki/files/apache/apache2.conf @@ -104,8 +104,21 @@ #LogLevel warn LogLevel notice -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %b" common +# +# The following directives define some format nicknames for use with +# a CustomLog directive. +# +# These deviate from the Common Log Format definitions in that they use %O +# (the actual bytes sent including headers) instead of %b (the size of the +# requested file), because the latter makes it impossible to detect partial +# requests. +# +# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended. +# Use mod_remoteip instead. +# +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 -- To view, visit https://gerrit.wikimedia.org/r/162541 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida8c362340025d75f6947f13d85865c037e7d4d0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jeremyb <jer...@tuxmachine.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits