[java-idp-jetty-base] 02/02: IDP-2297 Explore extending the Plugin and Module Infrastructure to allow Jetty installation

[Rod Widdowson]

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

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

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

commit 44e24381aa37e657f818a9c670ea3876028dfd69
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Oct 10 11:07:26 2024 +0100

    IDP-2297 Explore extending the Plugin and Module Infrastructure to allow Jetty installation
    
    https://shibboleth.atlassian.net/browse/IDP-2297
    
    Jetty base changes
     * Comment out the change of the http and ssl ports to 80 and 443
     * log jetty to idp.home
---
 .../shibboleth/idp/plugin/jettybase/module/resources/logback.xml | 6 +++---
 .../net/shibboleth/idp/plugin/jettybase/module/start.d/idp.ini   | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/resources/logback.xml b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/resources/logback.xml
index 86acebf..69f76d4 100644
--- a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/resources/logback.xml
+++ b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/resources/logback.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true">
   <appender name="jetty" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <File>${jetty.base}/logs/jetty.log</File>
+    <File>${idp.home}/logs/jetty.log</File>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <FileNamePattern>${jetty.base}/logs/jetty-%d{yyyy-MM-dd}.log.gz</FileNamePattern>
+      <FileNamePattern>${idp.home}/logs/jetty-%d{yyyy-MM-dd}.log.gz</FileNamePattern>
     </rollingPolicy>
     <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
       <charset>UTF-8</charset>
@@ -14,7 +14,7 @@
   <appender name="jetty-access" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <file>${jetty.base}/logs/access.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${jetty.base}/logs/access-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
+      <fileNamePattern>${idp.home}/logs/access-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
     </rollingPolicy>
     <encoder>
       <pattern>%msg%n</pattern>
diff --git a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/start.d/idp.ini b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/start.d/idp.ini
index c8dba1f..242e857 100644
--- a/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/start.d/idp.ini
+++ b/jetty-base-impl/src/main/resources/net/shibboleth/idp/plugin/jettybase/module/start.d/idp.ini
@@ -28,12 +28,13 @@ 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
+## Connector port to listen on jetty default is 8443
+## jetty.ssl.port=443
 
 ## Route request logging through standard logging API
 etc/jetty-requestlog.xml
 
-# Allows use of default IdP command line tools.
+## Allows use of default IdP command line tools.
 jetty.http.host=127.0.0.1
-jetty.http.port=80
+## jetty default is 8080
+## jetty.http.port=80

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