[java-idp-jetty-base] 01/04: JJETTY-24 Changes for Jetty-Base 12.1

[Rod Widdowson]

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

rdw pushed a commit to branch 12.1
in repository java-idp-jetty-base.

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

commit cca2715ed8bd3a0577267b5b1089336fc8295f4a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Oct 21 16:51:42 2025 +0100

    JJETTY-24 Changes for Jetty-Base 12.1
    
    https://shibboleth.atlassian.net/browse/JJETTY-24
    
    Split idp.ini into shibboleth.ini and a smaller idp.ini.
    Roll custom.ini into shibboleth.ini
---
 .../idp/module/jetty/jetty-base/start.d/custom.ini |  1 -
 .../idp/module/jetty/jetty-base/start.d/idp.ini    | 33 ++--------------------
 .../jetty-base/start.d/{idp.ini => shibboleth.ini} | 25 ++--------------
 3 files changed, 6 insertions(+), 53 deletions(-)

diff --git a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/custom.ini b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/custom.ini
deleted file mode 100644
index 4111f62..0000000
--- a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/custom.ini
+++ /dev/null
@@ -1 +0,0 @@
-jetty.ssl.sniHostCheck=false
diff --git a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/idp.ini b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/idp.ini
index cf06799..d8f31eb 100644
--- a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/idp.ini
+++ b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/idp.ini
@@ -1,47 +1,20 @@
-# --------------------------------------- 
-# Module: idp
-# Shibboleth IdP
-# --------------------------------------- 
---module=logging-logback
+#
+# Setup for the IdP
+#
 --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
-
 # Allows use of default IdP command line tools.
 jetty.http.host=127.0.0.1
 
 # Default jetty.http.port is 8080
 # jetty.http.port=80
 
-jetty.server.default.showContexts=false
-
 #
 # Uncomment the next line to enable the rewrite module
 # --module=rewrite
diff --git a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/idp.ini b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/shibboleth.ini
similarity index 58%
copy from src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/idp.ini
copy to src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/shibboleth.ini
index cf06799..1b71f63 100644
--- a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/idp.ini
+++ b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/shibboleth.ini
@@ -1,9 +1,6 @@
-# --------------------------------------- 
-# Module: idp
-# Shibboleth IdP
-# --------------------------------------- 
+# Setup common for running an IdP or a Hub (for SP4)
+
 --module=logging-logback
---module=idp
 
 ## Keystore file path (relative to $jetty.base)
 jetty.sslContext.keyStorePath=../credentials/idp-userfacing.p12
@@ -25,25 +22,9 @@ 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
 
-# Allows use of default IdP command line tools.
-jetty.http.host=127.0.0.1
-
-# Default jetty.http.port is 8080
-# jetty.http.port=80
-
 jetty.server.default.showContexts=false
 
-#
-# Uncomment the next line to enable the rewrite module
-# --module=rewrite
-# Documentation at
-# https://jetty.org/docs/jetty/12/operations-guide/modules/standard.html#rewrite
+jetty.ssl.sniHostCheck=false

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