From 6ded2027eb8a69beab72b4b2feb6f145bbb5a04c Mon Sep 17 00:00:00 2001
From: nghazalibeiklar <nghazalibeiklar@atlassian.com>
Date: Thu, 13 Jan 2022 11:27:16 +1100
Subject: [PATCH] DCD-1369: Enable log access for version after 7.11.0

---
 Dockerfile           | 2 ++
 config/server.xml.j2 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7321d43..4c1b856 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,6 +33,8 @@ RUN apt-get update \
 ARG CONFLUENCE_VERSION
 ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/confluence/downloads/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
 
+ENV CONFLUENCE_VERSION                              ${CONFLUENCE_VERSION}
+
 RUN groupadd --gid ${RUN_GID} ${RUN_GROUP} \
     && useradd --uid ${RUN_UID} --gid ${RUN_GID} --home-dir ${CONFLUENCE_HOME} --shell /bin/bash ${RUN_USER} \
     && echo PATH=$PATH > /etc/environment \
diff --git a/config/server.xml.j2 b/config/server.xml.j2
index 4218ef7..ac54b3a 100644
--- a/config/server.xml.j2
+++ b/config/server.xml.j2
@@ -41,7 +41,7 @@
           <Manager pathname=""/>
           <Valve className="org.apache.catalina.valves.StuckThreadDetectionValve"
                  threshold="60"/>
-        {% if atl_tomcat_access_log == 'true' %}
+        {% if (confluence_version.split('.') | map('int') | list) >= ('7.11.0'.split('.') | map('int') | list) or atl_tomcat_access_log == 'true' %}
           <Valve className="org.apache.catalina.valves.AccessLogValve"
                  requestAttributesEnabled="true"
                  directory="logs"