From b98a485fa84df02af467a05f2259908304a2e5b7 Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Tue, 7 May 2019 09:04:17 +1000
Subject: [PATCH] DCD-224: Fixes to the server.xml template.

---
 roles/jira_config/defaults/main.yml           |  2 +-
 .../molecule/default/tests/test_default.py    | 11 ++++
 roles/jira_config/templates/server.xml.j2     | 53 +++++++++----------
 3 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/roles/jira_config/defaults/main.yml b/roles/jira_config/defaults/main.yml
index 02f6366..cce3242 100644
--- a/roles/jira_config/defaults/main.yml
+++ b/roles/jira_config/defaults/main.yml
@@ -17,7 +17,7 @@ atl_tomcat_port: "8080"
 atl_tomcat_mgmt_port: "8005"
 atl_tomcat_acceptcount: "10"
 atl_tomcat_connectiontimeout: "20000"
-atl_tomcat_contextpath: "false"
+atl_tomcat_contextpath: ""
 atl_tomcat_maxthreads: "200"
 atl_tomcat_minsparethreads: "10"
 atl_tomcat_protocol: "HTTP/1.1"
diff --git a/roles/jira_config/molecule/default/tests/test_default.py b/roles/jira_config/molecule/default/tests/test_default.py
index 583e9fb..d11a2e4 100644
--- a/roles/jira_config/molecule/default/tests/test_default.py
+++ b/roles/jira_config/molecule/default/tests/test_default.py
@@ -31,4 +31,15 @@ def test_server_file(host):
     assert f.exists
     assert f.contains('Connector port="8080"')
     assert f.contains('Server port="8005"')
+    assert f.contains('<Context path=""')
+    assert f.contains('maxThreads="200"')
+    assert f.contains('minSpareThreads="10"')
+    assert f.contains('connectionTimeout="20000"')
+    assert f.contains('enableLookups="false"')
+    assert f.contains('protocol="HTTP/1.1"')
+    assert f.contains('redirectPort=""')
+    assert f.contains('acceptCount="10"')
+    assert f.contains('secure="false"')
+    assert f.contains('scheme="http"')
     assert not f.contains('proxyName=')
+    assert not f.contains('proxyPort=')
diff --git a/roles/jira_config/templates/server.xml.j2 b/roles/jira_config/templates/server.xml.j2
index 9314ff8..664bc83 100644
--- a/roles/jira_config/templates/server.xml.j2
+++ b/roles/jira_config/templates/server.xml.j2
@@ -12,61 +12,56 @@
 
   <Service name="Catalina">
 
-      <Connector port="{{ atl_tomcat_port }}"
-                 {% 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 %}
-                 maxThreads="{{ atl_tomcat_maxthreads }}"
-                 minSpareThreads="{{ atl_tomcat_minsparethreads }}"
-                 connectionTimeout="{{ atl_tomcat_connectiontimeout }}"
-                 enableLookups="{{ atl_tomcat_enablelookups }}"
-                 protocol="{{ atl_tomcat_protocol }}"
-                 redirectPort="{{ atl_tomcat_redirectport }}"
-                 acceptCount="{{ atl_tomcat_acceptcount }}"
+    <Connector port="{{ atl_tomcat_port }}"
+               maxThreads="{{ atl_tomcat_maxthreads }}"
+               minSpareThreads="{{ atl_tomcat_minsparethreads }}"
+               connectionTimeout="{{ atl_tomcat_connectiontimeout }}"
+               enableLookups="{{ atl_tomcat_enablelookups }}"
+               protocol="{{ atl_tomcat_protocol }}"
+               redirectPort="{{ atl_tomcat_redirectport }}"
+               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 %}
 
-                 disableUploadTimeout="true"
-                 relaxedPathChars="[]|"
-                 relaxedQueryChars="[]|{}^&#x5c;&#x60;&quot;&lt;&gt;"
-                 useBodyEncodingForURI="true"
-                 maxHttpHeaderSize="8192"
-                 bindOnInit="false" />
+               relaxedPathChars="[]|"
+               relaxedQueryChars="[]|{}^\`&quot;&lt;&gt;"
+               bindOnInit="false"
+               maxHttpHeaderSize="8192"
+               useBodyEncodingForURI="true"
+               disableUploadTimeout="true" />
 
     <Engine name="Catalina"
             defaultHost="localhost">
-
       <Host name="localhost"
             appBase="webapps"
             unpackWARs="true"
             autoDeploy="true">
 
-        <Context path=""
+        <Context path="{{ atl_tomcat_contextpath }}"
                  docBase="${catalina.home}/atlassian-jira"
                  reloadable="false"
                  useHttpOnly="true">
-
           <Resource name="UserTransaction"
                     auth="Container"
                     type="javax.transaction.UserTransaction"
                     factory="org.objectweb.jotm.UserTransactionFactory"
                     jotm.timeout="60"/>
-
           <Manager pathname=""/>
-
           <JarScanner scanManifest="false"/>
-
           <Valve className="org.apache.catalina.valves.StuckThreadDetectionValve"
                  threshold="120" />
-
         </Context>
 
       </Host>
-
       <Valve className="org.apache.catalina.valves.AccessLogValve"
              pattern="%a %{jira.request.id}r %{jira.request.username}r %t &quot;%m %U%q %H&quot; %s %b %D &quot;%{Referer}i&quot; &quot;%{User-Agent}i&quot; &quot;%{jira.request.assession.id}r&quot;"/>
-
     </Engine>
+
   </Service>
 </Server>