[jetty9] 126/135: Check the conf files relatively to the etc directory

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository jetty9.

commit 6a3322016d0ddcc21d8af98413f6dc0bdc3b79e8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 3 22:17:44 2015 +0100

    Check the conf files relatively to the etc directory
---
 debian/jetty9.init | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/jetty9.init b/debian/jetty9.init
index 5549cc9..3127dbb 100644
--- a/debian/jetty9.init
+++ b/debian/jetty9.init
@@ -5,6 +5,7 @@
 # Written by Philipp Meier <meier at meisterbohne.de>
 # Modified for Jetty 6 by Ludovic Claude <ludovic.claude at laposte.net>
 # Modified for Jetty 8 by Jakub Adam <jakub.adam at ktknet.cz>
+# Modified for Jetty 9 by Emmanuel Bourg <ebourg at apache.org>
 #
 ### BEGIN INIT INFO
 # Provides:          jetty9
@@ -203,10 +204,10 @@ if [ ! -z "${CONFIG_LINES}" ]
 then
   for CONF in ${CONFIG_LINES}
   do
-    if [ ! -r "$CONF" ] && [ ! -r "$JETTY_HOME/$CONF" ]
+    if [ ! -r "$CONF" ] && [ ! -r "$JETTY_HOME/etc/$CONF" ]
     then
       log_warning_msg "WARNING: Cannot read '$CONF' specified in '$JETTY_CONF'"
-    elif [ -f "$CONF" ] || [ -f "$JETTY_HOME/$CONF" ]
+    elif [ -f "$CONF" ] || [ -f "$JETTY_HOME/etc/$CONF" ]
     then
       # assume it's a configure.xml file
       CONFIGS="$CONFIGS $CONF"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git