From d9052c3e65cad0bde70d3e6c404a8a19d5569ec8 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@isti.cnr.it>
Date: Fri, 1 Dec 2017 18:34:08 +0100
Subject: [PATCH] Remove the redirections to the 8443 port from the tomcat
 server.xml templates. We do not configure ssl on tomcat directly, we use a
 reverse proxy.

---
 .../templates/tomcat-server.xml.j2                  |  4 ++--
 tomcat/templates/tomcat-server.xml.j2               | 13 ++-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/tomcat-multiple-instances/templates/tomcat-server.xml.j2 b/tomcat-multiple-instances/templates/tomcat-server.xml.j2
index ed83067a..af880bf7 100644
--- a/tomcat-multiple-instances/templates/tomcat-server.xml.j2
+++ b/tomcat-multiple-instances/templates/tomcat-server.xml.j2
@@ -66,12 +66,12 @@
                proxyName="{{ tomcat_m_reverse_proxy_name }}"
                proxyPort="{{ tomcat_m_reverse_proxy_port }}"
                {% endif %}
-               redirectPort="8443" />
+               />
 {% endif %}
 
 {% if item.ajp_enabled %}
     <!-- Define an AJP 1.3 Connector on port {{ tomcat_ajp_port }} -->
-    <Connector port="{{ item.ajp_port }}" protocol="AJP/1.3" redirectPort="8443"
+    <Connector port="{{ item.ajp_port }}" protocol="AJP/1.3"
 	           enableLookups="false"
                address="{{ item.ajp_address }}"
                URIEncoding="UTF-8"
diff --git a/tomcat/templates/tomcat-server.xml.j2 b/tomcat/templates/tomcat-server.xml.j2
index b3dc07d6..75bb0bca 100644
--- a/tomcat/templates/tomcat-server.xml.j2
+++ b/tomcat/templates/tomcat-server.xml.j2
@@ -89,21 +89,12 @@
                proxyName="{{ tomcat_reverse_proxy_name }}"
                proxyPort="{{ tomcat_reverse_proxy_port }}"
                {% endif %}
-               redirectPort="8443" />
+               />
 
-    <!-- Define a SSL HTTP/1.1 Connector on port 8443
-         This connector uses the JSSE configuration, when using APR, the
-         connector should be using the OpenSSL style configuration
-         described in the APR documentation -->
-    <!--
-    <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
-               maxThreads="150" scheme="https" secure="true"
-               clientAuth="false" sslProtocol="TLS" />
-    -->
 {% endif %}
 {% if tomcat_ajp_enabled %}
     <!-- Define an AJP 1.3 Connector on port {{ tomcat_ajp_port }} -->
-    <Connector port="{{ tomcat_ajp_port }}" protocol="AJP/1.3" redirectPort="8443"
+    <Connector port="{{ tomcat_ajp_port }}" protocol="AJP/1.3"
 	           enableLookups="false" address="{{ tomcat_ajp_address }}"
                maxQueueSize="{{ tomcat_max_queue_size | default(32767) }}"
                URIEncoding="UTF-8"