[java-idp-jetty-base] 03/04: IDP-1914 Work to ship Jetty 10 with the IdP Installer

[Ian Young]

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

iay pushed a commit to branch 10-windows
in repository java-idp-jetty-base.

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

commit 440b2b472300b8b8832a3c475f5806c7441deca4
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Mar 4 16:18:06 2022 +0000

    IDP-1914 Work to ship Jetty 10 with the IdP Installer
    
    https://shibboleth.atlassian.net/browse/IDP-1914
    
    start.d files
---
 .../jetty-base/start.d/idp-backchannel.ini         | 17 -----------
 .../resources/jetty-base/start.d/idp-system.ini    | 20 +++++++++++++
 src/main/resources/jetty-base/start.d/idp.ini      | 35 ----------------------
 .../start.d/idp.ini.rewrite.property.names         | 22 ++++++++++++++
 .../resources/jetty-base/start.d/idp.ini.windows   | 34 +++++++++++++++++++++
 5 files changed, 76 insertions(+), 52 deletions(-)

diff --git a/src/main/resources/jetty-base/start.d/idp-backchannel.ini b/src/main/resources/jetty-base/start.d/idp-backchannel.ini
deleted file mode 100644
index f872f00..0000000
--- a/src/main/resources/jetty-base/start.d/idp-backchannel.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# --------------------------------------- 
-# Module: idp-backchannel
-# Shibboleth IdP Dedicated SOAP Connector
-# --------------------------------------- 
---module=idp-backchannel
-
-## Backchannel connector port to listen on
-# idp.backchannel.port=8443
-
-## Backchannel keystore file path (relative to $jetty.base)
-# idp.backchannel.keyStorePath=../credentials/idp-backchannel.p12
-
-## Backchannel keystore password
-# idp.backchannel.keyStorePassword=changeit
-
-## Backchannel keystore type
-# idp.backchannel.keyStoreType=PKCS12
diff --git a/src/main/resources/jetty-base/start.d/idp-system.ini b/src/main/resources/jetty-base/start.d/idp-system.ini
new file mode 100644
index 0000000..043c9a5
--- /dev/null
+++ b/src/main/resources/jetty-base/start.d/idp-system.ini
@@ -0,0 +1,20 @@
+#
+# Do not edit anything in this file
+#
+--module=http
+--module=logging-logback
+--module=idp
+--module=idp-backchannel
+
+## Deny SSL renegotiation
+jetty.sslContext.renegotiationAllowed=false
+
+jetty.ssl.port=443
+jetty.http.port=80
+jetty.http.host=localhost
+
+#logback.version=2.0.0
+
+## Route request logging through standard logging API
+etc/jetty-requestlog.xml
+
diff --git a/src/main/resources/jetty-base/start.d/idp.ini b/src/main/resources/jetty-base/start.d/idp.ini
deleted file mode 100644
index d52e920..0000000
--- a/src/main/resources/jetty-base/start.d/idp.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# --------------------------------------- 
-# Module: idp
-# Shibboleth IdP
-# --------------------------------------- 
---module=logging-logback
---module=idp
-
-## Keystore file path (relative to $jetty.base)
-jetty.sslContext.keyStorePath=../credentials/idp-userfacing.p12
-## Truststore file path (relative to $jetty.base)
-jetty.sslContext.trustStorePath=../credentials/idp-userfacing.p12
-
-## Keystore type
-jetty.sslContext.keyStoreType=PKCS12
-## Truststore type and provider
-jetty.sslContext.trustStoreType=PKCS12
-
-## Keystore password
-jetty.sslContext.keyStorePassword=changeit
-## Truststore password
-jetty.sslContext.trustStorePassword=changeit
-## KeyManager password
-jetty.sslContext.keyManagerPassword=changeit
-
-## Deny SSL renegotiation
-jetty.sslContext.renegotiationAllowed=false
-
-## Connector host/address to bind to
-# jetty.ssl.host=0.0.0.0
-
-## Connector port to listen on
-jetty.ssl.port=443
-
-## Route request logging through standard logging API
-etc/jetty-requestlog.xml
diff --git a/src/main/resources/jetty-base/start.d/idp.ini.rewrite.property.names b/src/main/resources/jetty-base/start.d/idp.ini.rewrite.property.names
new file mode 100644
index 0000000..0d3635c
--- /dev/null
+++ b/src/main/resources/jetty-base/start.d/idp.ini.rewrite.property.names
@@ -0,0 +1,22 @@
+# Property names to change.
+# The format is "oldPropertyName=currentPropertyName"
+#
+# Note that in order to guarantee backwards compatibility we can only add to this list.
+#
+# IDP 
+jetty.host=jetty.ssl.host
+jetty.https.port=jetty.ssl.port
+jetty.browser.keystore.path=jetty.sslContext.keyStorePath
+jetty.browser.keystore.password=jetty.sslContext.keyStorePassword
+jetty.browser.keystore.type=jetty.sslContext.keyStoreType
+jetty.nonhttps.host=jetty.http.host
+jetty.nonhttps.port=jetty.http.port
+jetty.context.path=idp.context.path
+jetty.backchannel.host=idp.backchannel.host
+jetty.backchannel.port=idp.backchannel.port
+jetty.backchannel.keystore.path=idp.backchannel.keyStorePath
+jetty.backchannel.keystore.password=idp.backchannel.keyStorePassword
+jetty.backchannel.keystore.type=idp.backchannel.keyStoreType
+jetty.nonhttps.host=jetty.http.host
+jetty.nonhttps.port=jetty.http.port
+jetty.war.path=idp.war.path
diff --git a/src/main/resources/jetty-base/start.d/idp.ini.windows b/src/main/resources/jetty-base/start.d/idp.ini.windows
new file mode 100644
index 0000000..2693b6a
--- /dev/null
+++ b/src/main/resources/jetty-base/start.d/idp.ini.windows
@@ -0,0 +1,34 @@
+#
+# Note for Windows users:
+#
+# These are the only six properties which are guaranteed to work between
+# upgrades.  You may find more elsewhere and add them here and they may
+# work. For this release.
+#
+# To repeat, only properties listed below are guarantee to work between
+# upgrades.
+#
+
+#
+# KeyStore Management.
+# In the following
+#     "idp.backchannel.*" refers to the TLS connection on the SOAP port (8443)
+#     "jetty.sslContext.*" refers to the TLS connection on 443
+
+
+idp.backchannel.keyStorePath=../credentials/idp-backchannel.p12
+jetty.sslContext.keyStorePath=../credentials/idp-userfacing.p12
+
+# Keystore passwords
+#
+idp.backchannel.keyStorePassword=changeit
+jetty.sslContext.keyStorePassword=changeit
+
+
+# Keystore types
+# You ahould not need to change them and support
+# may be removed in future releases
+idp.backchannel.keyStoreType=PKCS12
+jetty.sslContext.keyStoreType=PKCS12
+
+

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