From b28952205d7042be532eb2b4d3b9228eefdbb04a Mon Sep 17 00:00:00 2001
From: Glenn Stewart <gstewart@atlassian.com>
Date: Thu, 20 Oct 2022 10:55:12 +1100
Subject: [PATCH] ITPLT-2175 Allow for use of Application Tunnels -
 https://support.atlassian.com/organization-administration/docs/configure-application-tunnels/
 - Confluence

---
 .../confluence_config/templates/server.xml.j2 | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/roles/confluence_config/templates/server.xml.j2 b/roles/confluence_config/templates/server.xml.j2
index 55f9c25..759d7dd 100644
--- a/roles/confluence_config/templates/server.xml.j2
+++ b/roles/confluence_config/templates/server.xml.j2
@@ -22,13 +22,10 @@
                acceptCount="{{ atl_tomcat_acceptcount }}"
                secure="{{ atl_tomcat_secure }}"
                scheme="{{ atl_tomcat_scheme }}"
-               {% if atl_proxy_name is defined and atl_proxy_name != '' %}
-                 proxyName="{{ atl_proxy_name }}"
-               {% endif %}
-               {% if atl_proxy_port is defined and atl_proxy_port != '' %}
-                 proxyPort="{{ atl_proxy_port }}"
-               {% endif %}
-
+               {% if atl_proxy_name is defined and atl_proxy_name != '' -%}proxyName="{{ atl_proxy_name }}"
+               {% endif -%}
+               {% if atl_proxy_port is defined and atl_proxy_port != '' -%}proxyPort="{{ atl_proxy_port }}"
+               {% endif -%}
                relaxedPathChars="[]|"
                relaxedQueryChars="[]|{}^\`&quot;&lt;&gt;"
                bindOnInit="false"
@@ -40,7 +37,6 @@
     <Connector port="{{ atl_tomcat_redirectport }}"
                protocol="{{ atl_tomcat_protocol }}"
                connectionTimeout="{{ atl_tomcat_connectiontimeout }}"
-
                relaxedPathChars="[]|"
                relaxedQueryChars="[]|{}^\`&quot;&lt;&gt;"
                maxHttpHeaderSize="65536"
@@ -50,6 +46,15 @@
                compressableMimeType="text/html,text/xml,text/plain,text/css,application/json,application/javascript,application/x-javascript" />
     {% endif %}
 
+    {% if atl_apptunnel_port is defined and atl_apptunnel_port != '' %}
+    <Connector port="{{ atl_apptunnel_port }}"
+               connectionTimeout="20000"
+               maxThreads="200"
+               minSpareThreads="10" 
+               enableLookups="false"
+               acceptCount="10"
+               URIEncoding="UTF-8"
+    {% endif %}
 
     <Engine name="Standalone"
             defaultHost="localhost"