This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jetty9.
commit b76fbf103fcf80961581811de99f6ab7509cd83d Author: Emmanuel Bourg <[email protected]> Date: Thu Sep 11 13:19:49 2014 +0200 debian/jetty8.init now recognizes paths relative to JETTY_HOME in /etc/jetty8/jetty.conf --- debian/changelog | 2 ++ debian/jetty8.init | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 055fd3b..f4514ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ jetty8 (8.1.15-1) UNRELEASED; urgency=medium * debian/watch: Watch the tags from the Git repository * debian/jetty-shared-webapps.xml: Updated the path of the webapps directory * debian/jetty8.init: Added the missing JETTY_CONF variable + * debian/jetty8.init: Paths relative to JETTY_HOME are now recognized + in /etc/jetty8/jetty.conf * Switch to debhelper level 9 -- Emmanuel Bourg <[email protected]> Wed, 30 Jul 2014 16:01:22 +0200 diff --git a/debian/jetty8.init b/debian/jetty8.init index 03071b5..faf41d4 100644 --- a/debian/jetty8.init +++ b/debian/jetty8.init @@ -226,10 +226,10 @@ if [ ! -z "${CONFIG_LINES}" ] then for CONF in ${CONFIG_LINES} do - if [ ! -r "$CONF" ] + if [ ! -r "$CONF" ] && [ ! -r "$JETTY_HOME/$CONF" ] then log_warning_msg "WARNING: Cannot read '$CONF' specified in '$JETTY_CONF'" - elif [ -f "$CONF" ] + elif [ -f "$CONF" ] || [ -f "$JETTY_HOME/$CONF" ] then # assume it's a configure.xml file CONFIGS="$CONFIGS $CONF" @@ -259,7 +259,7 @@ fi ##################################################### if [ -z "$CONFIGS" ] then - CONFIGS="/etc/jetty8/jetty-logging.xml /etc/jetty8/jetty.xml" + CONFIGS="/etc/jetty8/jetty-logging.xml /etc/jetty8/jetty-started.xml" fi ################################################## -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
