[java-idp-tomcat-base] branch 8.0 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.0
in repository java-idp-tomcat-base.

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

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

commit 58b091ef7f6304b03e077e3f28c1b82f19aee954
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Sat Mar 24 15:43:33 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 029628c..0a07ae6 100644
--- a/src/main/resources/tomcat-base/conf/catalina.properties
+++ b/src/main/resources/tomcat-base/conf/catalina.properties
@@ -258,6 +258,7 @@ tomcat.host=localhost
 
 # The HTTPS port
 tomcat.https.port=8443
+tomcat.https.keystoreFile=../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 c18f754..292134d 100644
--- a/src/main/resources/tomcat-base/conf/server.xml
+++ b/src/main/resources/tomcat-base/conf/server.xml
@@ -68,11 +68,11 @@
          style configuration. When using the APR/native implementation, the
          OpenSSL style configuration is required as described in the APR/native
          documentation -->
-    <!--
-    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+
+    <Connector port="${tomcat.https.port}" protocol="org.apache.coyote.http11.Http11NioProtocol"
                maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
-               clientAuth="false" sslProtocol="TLS" />
-    -->
+               clientAuth="false" sslProtocol="TLS" keystoreFile="${tomcat.https.keystoreFile}" />
+
     <Connector port="${tomcat.backchannel.port}" protocol="org.apache.coyote.http11.Http11NioProtocol"
            maxThreads="150"
            maxPostSize="100000"

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