[java-idp-jetty-base] 04/06: IDP-1110 - Add property defaults to XML and comments to ini

[Tom Zeller]

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

tzeller pushed a commit to branch 9.4
in repository java-idp-jetty-base.

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

commit ced295ef2b1d86efba9ce190743357bc3ec186be
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Apr 25 17:19:13 2018 -0500

    IDP-1110 - Add property defaults to XML and comments to ini
    
    https://issues.shibboleth.net/jira/browse/IDP-1110
---
 src/main/resources/jetty-base/etc/idp-backchannel.xml     |  6 +++---
 src/main/resources/jetty-base/etc/jetty-ssl-context.xml   |  6 +++---
 src/main/resources/jetty-base/start.d/idp-backchannel.ini | 10 +++++-----
 src/main/resources/jetty-base/start.d/idp.ini             |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/jetty-base/etc/idp-backchannel.xml b/src/main/resources/jetty-base/etc/idp-backchannel.xml
index 9f19c95..362486d 100644
--- a/src/main/resources/jetty-base/etc/idp-backchannel.xml
+++ b/src/main/resources/jetty-base/etc/idp-backchannel.xml
@@ -9,9 +9,9 @@
   <!-- for backchannel (SOAP) communication to IdP                   -->
   <!-- ============================================================= -->
   <New id="shibContextFactory" class="net.shibboleth.utilities.jetty9.DelegateToApplicationSslContextFactory">
-    <Set name="KeyStorePath"><Property name="jetty.backchannel.keystore.path" /></Set>
-    <Set name="KeyStoreType"><Property name="jetty.backchannel.keystore.type" /></Set>
-    <Set name="KeyStorePassword"><Property name="jetty.backchannel.keystore.password" /></Set>
+    <Set name="KeyStorePath"><Property name="jetty.backchannel.keystore.path" default="../credentials/idp-backchannel.p12" /></Set>
+    <Set name="KeyStoreType"><Property name="jetty.backchannel.keystore.type" default="PKCS12" /></Set>
+    <Set name="KeyStorePassword"><Property name="jetty.backchannel.keystore.password" default="changeit" /></Set>
     <!-- This is a tweak to work around a bug in Jetty when using the PKCS12 keystore type. -->
     <Set name="TrustStoreType"><Property name="jetty.backchannel.keystore.type" /></Set>
     <Set name="EndpointIdentificationAlgorithm"></Set>
diff --git a/src/main/resources/jetty-base/etc/jetty-ssl-context.xml b/src/main/resources/jetty-base/etc/jetty-ssl-context.xml
index 08a7285..752cb72 100644
--- a/src/main/resources/jetty-base/etc/jetty-ssl-context.xml
+++ b/src/main/resources/jetty-base/etc/jetty-ssl-context.xml
@@ -5,9 +5,9 @@
   <!-- TLS context factory without client auth                       -->
   <!-- ============================================================= -->
   <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
-    <Set name="KeyStorePath"><Property name="jetty.sslContext.keyStorePath" /></Set>
-    <Set name="KeyStoreType"><Property name="jetty.sslContext.keyStoreType" /></Set>
-    <Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" /></Set>
+    <Set name="KeyStorePath"><Property name="jetty.sslContext.keyStorePath" default="../credentials/idp-userfacing.p12" /></Set>
+    <Set name="KeyStoreType"><Property name="jetty.sslContext.keyStoreType" default="PKCS12" /></Set>
+    <Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" default="changeit" /></Set>
     <!-- This is a tweak to work around a bug in Jetty when using the PKCS12 keystore type. -->
     <Set name="TrustStoreType"><Property name="jetty.sslContext.keyStoreType" /></Set>
     <Set name="EndpointIdentificationAlgorithm"></Set>
diff --git a/src/main/resources/jetty-base/start.d/idp-backchannel.ini b/src/main/resources/jetty-base/start.d/idp-backchannel.ini
index ea5d208..9ee126a 100644
--- a/src/main/resources/jetty-base/start.d/idp-backchannel.ini
+++ b/src/main/resources/jetty-base/start.d/idp-backchannel.ini
@@ -4,8 +4,8 @@
 # --------------------------------------- 
 --module=idp-backchannel
 
-jetty.backchannel.host=0.0.0.0
-jetty.backchannel.port=9443
-jetty.backchannel.keystore.path=../credentials/idp-backchannel.p12
-jetty.backchannel.keystore.password=changeit
-jetty.backchannel.keystore.type=PKCS12
+# jetty.backchannel.host=0.0.0.0
+# jetty.backchannel.port=8443
+# jetty.backchannel.keystore.path=../credentials/idp-backchannel.p12
+# jetty.backchannel.keystore.password=changeit
+# jetty.backchannel.keystore.type=PKCS12
diff --git a/src/main/resources/jetty-base/start.d/idp.ini b/src/main/resources/jetty-base/start.d/idp.ini
index 9f8f88b..cb5d3ce 100644
--- a/src/main/resources/jetty-base/start.d/idp.ini
+++ b/src/main/resources/jetty-base/start.d/idp.ini
@@ -4,9 +4,9 @@
 # --------------------------------------- 
 --module=idp
 
-jetty.sslContext.keyStorePath=../credentials/idp-userfacing.p12
-jetty.sslContext.keyStoreType=PKCS12
-jetty.sslContext.keyStorePassword=changeit
+# jetty.sslContext.keyStorePath=../credentials/idp-userfacing.p12
+# jetty.sslContext.keyStoreType=PKCS12
+# jetty.sslContext.keyStorePassword=changeit
 
 ## Connector host/address to bind to
 # jetty.ssl.host=0.0.0.0

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