[java-idp-tomcat-base] branch 8.5 updated: Add TLS Connector using NIO

[Tom Zeller]

This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch 8.5
in repository java-idp-tomcat-base.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-tomcat-base.git;a=commit;h=d920a5b6da947b3bce8a592261d5ac001c324125

The following commit(s) were added to refs/heads/8.5 by this push:
       new  d920a5b   Add TLS Connector using NIO
d920a5b is described below

commit d920a5b6da947b3bce8a592261d5ac001c324125
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Thu Mar 22 15:02:13 2018 -0500

    Add TLS Connector using NIO
---
 src/main/resources/tomcat-base/conf/catalina.properties | 1 +
 src/main/resources/tomcat-base/conf/server.xml          | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/tomcat-base/conf/catalina.properties b/src/main/resources/tomcat-base/conf/catalina.properties
index 0c5f8a8..005aedc 100644
--- a/src/main/resources/tomcat-base/conf/catalina.properties
+++ b/src/main/resources/tomcat-base/conf/catalina.properties
@@ -260,6 +260,7 @@ tomcat.host=localhost
 
 # The HTTPS port
 tomcat.https.port=8443
+tomcat.https.certificateKeystoreFile=../credentials/idp-userfacing.p12
 
 # The SOAP endpoint port
 tomcat.backchannel.port=9443
diff --git a/src/main/resources/tomcat-base/conf/server.xml b/src/main/resources/tomcat-base/conf/server.xml
index 89d323e..b08afea 100644
--- a/src/main/resources/tomcat-base/conf/server.xml
+++ b/src/main/resources/tomcat-base/conf/server.xml
@@ -67,15 +67,15 @@
          This connector uses the NIO implementation with the JSSE engine. When
          using the JSSE engine, the JSSE configuration attributes must be used.
     -->
-    <!--
-    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+
+    <Connector port="${tomcat.https.port}" protocol="org.apache.coyote.http11.Http11NioProtocol"
                maxThreads="150" SSLEnabled="true">
         <SSLHostConfig>
-            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+            <Certificate certificateKeystoreFile="${tomcat.https.certificateKeystoreFile}"
                          type="RSA" />
         </SSLHostConfig>
     </Connector>
-    -->
+
     <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
          This connector uses the APR/native implementation. When using the
          APR/native implementation or the OpenSSL engine with NIO or NIO2 then

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.