From 8cce735461d9de35e1a766cb2197572b7e923c2d Mon Sep 17 00:00:00 2001 From: nghazalibeiklar Date: Thu, 13 Jan 2022 12:50:04 +1100 Subject: [PATCH] DCD-1369: Updated the documentation and fix the default value and respect to alt_tomcat_log_access variable for all versions --- README.md | 2 +- config/server.xml.j2 | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 116fd21..c507e2a 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ of the setup. They can be controlled via the below environment variables. The context path the application is served over. `CATALINA_CONTEXT_PATH` is also supported for backwards compatability. -* `ATL_TOMCAT_ACCESS_LOG` (default: false) +* `ATL_TOMCAT_ACCESS_LOG` (default: false [version < 7.11.0] and true [version >=7.11.0]) Whether to enable Tomcat access logging; set to `true` to enable. *NOTE*: These logs are written to the Container internal volume by default (under diff --git a/config/server.xml.j2 b/config/server.xml.j2 index ac54b3a..9f3cf21 100644 --- a/config/server.xml.j2 +++ b/config/server.xml.j2 @@ -41,7 +41,8 @@ - {% if (confluence_version.split('.') | map('int') | list) >= ('7.11.0'.split('.') | map('int') | list) or atl_tomcat_access_log == 'true' %} + {% if ((atl_tomcat_access_log == 'true') or + (atl_tomcat_access_log is none and (confluence_version.split('.') | map('int') | list) >= ('7.11.0'.split('.') | map('int') | list)) ) %}