[java-idp-jetty-base] 02/04: IDP-2285 Start looking at Windows Installer for Jetty12

[Rod Widdowson]

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

rdw pushed a commit to branch dev/IDP-2285
in repository java-idp-jetty-base.

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

commit ec4bc1fea77d57a67836107c1a1cbad002d79240
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Jun 23 13:38:09 2024 +0100

    IDP-2285 Start looking at Windows Installer for Jetty12
    
    https://shibboleth.atlassian.net/issues/IDP-2285
    
    Merge forward the start.d changes from the IDP-2147 branch
---
 .../jetty-base/start.d.dist/idp-system.ini         | 20 +++++++++++
 .../jetty-base/start.d.dist/idp.ini.windows        | 21 ++++++++++++
 src/main/resources/jetty-base/start.d/custom.ini   |  1 -
 src/main/resources/jetty-base/start.d/idp.ini      | 39 ----------------------
 4 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/src/main/resources/jetty-base/start.d.dist/idp-system.ini b/src/main/resources/jetty-base/start.d.dist/idp-system.ini
new file mode 100644
index 0000000..69d9ca2
--- /dev/null
+++ b/src/main/resources/jetty-base/start.d.dist/idp-system.ini
@@ -0,0 +1,20 @@
+#
+# Do not edit anything in this file
+#
+--module=http
+--module=logging-logback
+--module=idp
+
+## Deny SSL renegotiation
+jetty.sslContext.renegotiationAllowed=false
+
+jetty.ssl.port=443
+jetty.http.port=80
+jetty.http.host=localhost
+
+logback.version=1.4.9
+
+## Route request logging through standard logging API
+etc/jetty-requestlog.xml
+
+jetty.ssl.sniHostCheck=false
diff --git a/src/main/resources/jetty-base/start.d.dist/idp.ini.windows b/src/main/resources/jetty-base/start.d.dist/idp.ini.windows
new file mode 100644
index 0000000..3c2e7a4
--- /dev/null
+++ b/src/main/resources/jetty-base/start.d.dist/idp.ini.windows
@@ -0,0 +1,21 @@
+#
+# Note for Windows users:
+#
+# These are the only three 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.
+#
+jetty.sslContext.keyStorePath=../credentials/idp-userfacing.p12
+jetty.sslContext.keyStorePassword=changeit
+
+#
+# Keystore type: you ahould not need to change this
+#
+jetty.sslContext.keyStoreType=PKCS12
diff --git a/src/main/resources/jetty-base/start.d/custom.ini b/src/main/resources/jetty-base/start.d/custom.ini
deleted file mode 100644
index 4111f62..0000000
--- a/src/main/resources/jetty-base/start.d/custom.ini
+++ /dev/null
@@ -1 +0,0 @@
-jetty.ssl.sniHostCheck=false
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 92b2b87..0000000
--- a/src/main/resources/jetty-base/start.d/idp.ini
+++ /dev/null
@@ -1,39 +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
-
-# Allows use of default IdP command line tools.
-jetty.http.host=127.0.0.1
-jetty.http.port=80

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