From 6f52ea0f1a4c3255925e12ff6f08f3e17c3b7157 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Sun, 8 Nov 2020 22:35:00 +0100
Subject: [PATCH] Align Tomcat configs for ODK and Mifos with Tomcat upstream

---
 lxc-apps/mifosx/install/mifosx_conf/server.xml   | 12 ++++++++----
 lxc-apps/opendatakit/install/odk_conf/server.xml | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/lxc-apps/mifosx/install/mifosx_conf/server.xml b/lxc-apps/mifosx/install/mifosx_conf/server.xml
index 9be45e6..4f8fe2d 100644
--- a/lxc-apps/mifosx/install/mifosx_conf/server.xml
+++ b/lxc-apps/mifosx/install/mifosx_conf/server.xml
@@ -79,7 +79,7 @@
                connectionTimeout="20000"
                redirectPort="8443" />
     -->
-    <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
          This connector uses the NIO implementation. The default
          SSLImplementation will depend on the presence of the APR/native
          library and the useOpenSSL attribute of the
@@ -96,7 +96,7 @@
         </SSLHostConfig>
     </Connector>
     -->
-    <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
          This connector uses the APR/native implementation which always uses
          OpenSSL for TLS.
          Either JSSE or OpenSSL style configuration may be used. OpenSSL style
@@ -116,8 +116,12 @@
     -->
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
-
+    <!--
+    <Connector protocol="AJP/1.3"
+               address="::1"
+               port="8009"
+               redirectPort="8443" />
+    -->
 
     <!-- An Engine represents the entry point (within Catalina) that processes
          every request.  The Engine implementation for Tomcat stand alone
diff --git a/lxc-apps/opendatakit/install/odk_conf/server.xml b/lxc-apps/opendatakit/install/odk_conf/server.xml
index 1401139..4f784f8 100644
--- a/lxc-apps/opendatakit/install/odk_conf/server.xml
+++ b/lxc-apps/opendatakit/install/odk_conf/server.xml
@@ -79,7 +79,7 @@
                connectionTimeout="20000"
                redirectPort="8443" />
     -->
-    <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
          This connector uses the NIO implementation. The default
          SSLImplementation will depend on the presence of the APR/native
          library and the useOpenSSL attribute of the
@@ -96,7 +96,7 @@
         </SSLHostConfig>
     </Connector>
     -->
-    <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
          This connector uses the APR/native implementation which always uses
          OpenSSL for TLS.
          Either JSSE or OpenSSL style configuration may be used. OpenSSL style
@@ -116,8 +116,12 @@
     -->
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
-
+    <!--
+    <Connector protocol="AJP/1.3"
+               address="::1"
+               port="8009"
+               redirectPort="8443" />
+    -->
 
     <!-- An Engine represents the entry point (within Catalina) that processes
          every request.  The Engine implementation for Tomcat stand alone