commit de55149d25e1740db5078152a5f6111fc4fea318
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Oct 5 17:12:57 2012 +0200
Allow to override the default JETTY_PORT, resolves: rhbz#826551
jetty.init | 14 +++++++++++---
jetty.spec | 5 ++++-
2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/jetty.init b/jetty.init
index 58e5664..e2633cb 100644
--- a/jetty.init
+++ b/jetty.init
@@ -73,10 +73,18 @@ start() {
# [ -x ${JETTY_HOME}/ext ] &&
# rebuild-jar-repository -s ${JETTY_HOME}/ext
- if [ -x /etc/rc.d/init.d/functions ]; then
- daemon --user $JETTY_USER JETTY_PID=$JETTY_PID $JETTY_SCRIPT
+ if [ -f /etc/rc.d/init.d/functions ]; then
+ if [ -z "$JETTY_PORT" ]; then
+ daemon --user $JETTY_USER JETTY_PID=$JETTY_PID $JETTY_SCRIPT
+ else
+ daemon --user $JETTY_USER JETTY_PID=$JETTY_PID
JETTY_PORT=$JETTY_PORT $JETTY_SCRIPT
+ fi
else
- su - $JETTY_USER -c "JETTY_PID=$JETTY_PID $JETTY_SCRIPT"
+ if [ -z "$JETTY_PORT" ]; then
+ su - $JETTY_USER -c "JETTY_PID=$JETTY_PID
$JETTY_SCRIPT"
+ else
+ su - $JETTY_USER -c "JETTY_PID=$JETTY_PID
JETTY_PORT=$JETTY_PORT $JETTY_SCRIPT"
+ fi
fi
RETVAL=$?
diff --git a/jetty.spec b/jetty.spec
index d72f1fd..9cdb7d2 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -42,7 +42,7 @@
Name: jetty
Version: 6.1.26
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: The Jetty Webserver and Servlet Container
Group: Applications/Internet
@@ -359,6 +359,9 @@ fi
%doc %{_docdir}/%{name}-%{version}
%changelog
+* Fri Oct 5 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 6.1.26-9
+- Allow to override the default JETTY_PORT, resolves: rhbz#826551
+
* Mon Jan 16 2012 Jeff Johnston <jjohnstn(a)redhat.com> 6.1.26-8
- Resolves CVE-2011-4461
Show replies by date