From 083714c8988e0de5bb82b658772d6f586317bf24 Mon Sep 17 00:00:00 2001
From: Glenn Stewart <gstewart@atlassian.com>
Date: Thu, 26 May 2022 14:27:46 +1000
Subject: [PATCH] ITPLT-1404 Allow for use of Application Tunnels -
 https://support.atlassian.com/organization-administration/docs/configure-application-tunnels/

---
 group_vars/aws_node_local.yml             |  1 +
 roles/jira_config/templates/server.xml.j2 | 24 +++++++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml
index af50e28..b56321c 100644
--- a/group_vars/aws_node_local.yml
+++ b/group_vars/aws_node_local.yml
@@ -125,6 +125,7 @@ atl_proxy_name:  "{{ lookup('env', 'ATL_PROXY_NAME') | lower }}"
 atl_proxy_port:  "{{ lookup('env', 'ATL_TOMCAT_PROXYPORT') }}"
 atl_tomcat_port: "{{ lookup('env', 'ATL_TOMCAT_DEFAULTCONNECTORPORT') or '8080' }}"
 atl_ssl_proxy: "{{ lookup('env', 'ATL_SSL_PROXY') or 'false' }}"
+atl_apptunnel_port: "{{ lookup('env', 'ATL_APPTUNNEL_PORT') or '' }}"
 
 atl_tomcat_acceptcount: "{{ lookup('env', 'ATL_TOMCAT_ACCEPTCOUNT') or '10' }}"
 atl_tomcat_connectiontimeout: "{{ lookup('env', 'ATL_TOMCAT_CONNECTIONTIMEOUT') or '20000' }}"
diff --git a/roles/jira_config/templates/server.xml.j2 b/roles/jira_config/templates/server.xml.j2
index 7293f5b..cecd91e 100644
--- a/roles/jira_config/templates/server.xml.j2
+++ b/roles/jira_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,18 @@
                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"
+               relaxedPathChars="[]|"
+               relaxedQueryChars="[]|{}^&#x5c;&#x60;&quot;&lt;&gt;"/>
+    {% endif %}
+
     <Engine name="Catalina"
             defaultHost="localhost">
       <Host name="localhost"