From a969dafb9df71e63a75fddd2b672ed244f832d8a Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 22 Dec 2020 10:24:17 +0100
Subject: [PATCH] Encapsulate ip in apache access log to cover proxy forwarded
multiple ips separated by comma and space
---
templates/vhost.conf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/templates/vhost.conf b/templates/vhost.conf
index aeeae55..3ef6dc3 100644
--- a/templates/vhost.conf
+++ b/templates/vhost.conf
@@ -14,7 +14,7 @@
{% if apache_version|default('2.4') == '2.4' %}
ErrorLogFormat "[%{u}t] [%l] [pid %P] [client\ %{X-Forwarded-For}i] %M% ,\ referer:\ %{Referer}i"
{% endif %}
- LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
+ LogFormat "\"%{X-Forwarded-For}i\" %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
ErrorLog {{ apacheLogDir }}/{{ matomo.domain }}-error.log
CustomLog {{ apacheLogDir }}/{{ matomo.domain }}-access.log combined env=!forwarded
CustomLog {{ apacheLogDir }}/{{ matomo.domain }}-access.log proxy env=forwarded
@@ -64,7 +64,7 @@
{% if apache_version|default('2.4') == '2.4' %}
ErrorLogFormat "[%{u}t] [%l] [pid %P] [client\ %{X-Forwarded-For}i] %M% ,\ referer:\ %{Referer}i"
{% endif %}
- LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
+ LogFormat "\"%{X-Forwarded-For}i\" %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
ErrorLog {{ apacheLogDir }}/{{ matomo.domain }}-error.log
CustomLog {{ apacheLogDir }}/{{ matomo.domain }}-access.log combined env=!forwarded
CustomLog {{ apacheLogDir }}/{{ matomo.domain }}-access.log proxy env=forwarded
@@ -117,7 +117,7 @@
{% if apache_version|default('2.4') == '2.4' %}
ErrorLogFormat "[%{u}t] [%l] [pid %P] [client\ %{X-Forwarded-For}i] %M% ,\ referer:\ %{Referer}i"
{% endif %}
- LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
+ LogFormat "\"%{X-Forwarded-For}i\" %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
ErrorLog {{ apacheLogDir }}/{{ certs.domain }}-error.log
CustomLog {{ apacheLogDir }}/{{ certs.domain }}-access.log combined env=!forwarded
CustomLog {{ apacheLogDir }}/{{ certs.domain }}-access.log proxy env=forwarded
--
GitLab