From 3c615980ef1353968ed43b65e635c75c70142969 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@sevenseas.org>
Date: Fri, 18 Mar 2016 18:18:49 +0100
Subject: [PATCH] 
 library/roles/tomcat-multiple-instances/templates/tomcat-server.xml.j2,
 library/roles/tomcat/templates/tomcat-server.xml.j2: Support the
 x-forwarded-for header in the access_log configuration.

---
 tomcat-multiple-instances/templates/tomcat-server.xml.j2 | 7 +++++--
 tomcat/templates/tomcat-server.xml.j2                    | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tomcat-multiple-instances/templates/tomcat-server.xml.j2 b/tomcat-multiple-instances/templates/tomcat-server.xml.j2
index d4f70d3..89c3053 100644
--- a/tomcat-multiple-instances/templates/tomcat-server.xml.j2
+++ b/tomcat-multiple-instances/templates/tomcat-server.xml.j2
@@ -94,12 +94,15 @@
             >
 
 {% if item.access_log_enabled %}
+        <!-- Automatically substitutes the IP with the one contained
+             in the x-forwarded-for header if that header is set -->
+        <Valve className="org.apache.catalina.valves.RemoteIpValve" />
         <!-- Access log processes all example.
              Documentation at: /docs/config/valve.html
-             Note: The pattern used is equivalent to using pattern="common" -->
+             Note: The pattern used is equivalent to using pattern="combined" -->
         <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
                prefix="localhost_access." suffix="log"
-               pattern="%h %l %u %t &quot;%r&quot; %s %b"
+               pattern="combined"
 	       rotatable="False"
 	       />
 {% endif %}
diff --git a/tomcat/templates/tomcat-server.xml.j2 b/tomcat/templates/tomcat-server.xml.j2
index 1bc1337..2268cb4 100644
--- a/tomcat/templates/tomcat-server.xml.j2
+++ b/tomcat/templates/tomcat-server.xml.j2
@@ -139,12 +139,15 @@
         -->
 
 {% if tomcat_access_log_enabled %}
+        <!-- Automatically substitutes the IP with the one contained
+             in the x-forwarded-for header if that header is set -->
+        <Valve className="org.apache.catalina.valves.RemoteIpValve" />
         <!-- Access log processes all example.
              Documentation at: /docs/config/valve.html
-             Note: The pattern used is equivalent to using pattern="common" -->
+             Note: The pattern used is equivalent to using pattern="combined" -->
         <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
                prefix="localhost_access." suffix="log"
-               pattern="%h %l %u %t &quot;%r&quot; %s %b"
+               pattern="combined"
 	       rotatable="False"
 	       />
 {% endif %}