From 1d68e80cf4f59227f5d2a439c793db1aee428418 Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Mon, 27 May 2019 11:41:31 +1000
Subject: [PATCH] DCD-352: Port server.xml changes from Jira fixes.

---
 roles/confluence_config/templates/server.xml.j2 | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/roles/confluence_config/templates/server.xml.j2 b/roles/confluence_config/templates/server.xml.j2
index 664bc83..9e55982 100644
--- a/roles/confluence_config/templates/server.xml.j2
+++ b/roles/confluence_config/templates/server.xml.j2
@@ -36,6 +36,20 @@
                useBodyEncodingForURI="true"
                disableUploadTimeout="true" />
 
+    {% if atl_tomcat_redirectport is defined and atl_tomcat_redirectport != '' %}
+    <Connector port="{{ atl_tomcat_redirectport }}"
+               protocol="{{ atl_tomcat_protocol }}"
+               connectionTimeout="{{ atl_tomcat_connectiontimeout }}"
+
+               relaxedPathChars="[]|"
+               relaxedQueryChars="[]|{}^\`&quot;&lt;&gt;"
+               maxHttpHeaderSize="65536"
+               URIEncoding="UTF-8"
+               useBodyEncodingForURI="true"
+               compression="on"
+               compressableMimeType="text/html,text/xml,text/plain,text/css,application/json,application/javascript,application/x-javascript" />
+    {% endif %}
+
     <Engine name="Catalina"
             defaultHost="localhost">
       <Host name="localhost"
@@ -44,7 +58,7 @@
             autoDeploy="true">
 
         <Context path="{{ atl_tomcat_contextpath }}"
-                 docBase="${catalina.home}/atlassian-jira"
+                 docBase="${catalina.home}/confluence"
                  reloadable="false"
                  useHttpOnly="true">
           <Resource name="UserTransaction"