From 2a7155345569ddf6c1779dd1ba4269f02712d406 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/vhost.conf b/templates/vhost.conf
index c9f1c19..20e708b 100644
--- a/templates/vhost.conf
+++ b/templates/vhost.conf
@@ -13,7 +13,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 ${APACHE_LOG_DIR}/{{ domain.domain }}-error.log
   CustomLog ${APACHE_LOG_DIR}/{{ domain.domain }}-access.log combined env=!forwarded
   CustomLog ${APACHE_LOG_DIR}/{{ domain.domain }}-access.log proxy env=forwarded
@@ -42,7 +42,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 ${APACHE_LOG_DIR}/{{ domain.domain }}-error.log
   CustomLog ${APACHE_LOG_DIR}/{{ domain.domain }}-access.log combined env=!forwarded
   CustomLog ${APACHE_LOG_DIR}/{{ domain.domain }}-access.log proxy env=forwarded
-- 
GitLab