[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-94-ge32b5c9
X2Go dev team
git-admin at x2go.org
Wed Dec 18 20:54:59 CET 2013
The branch, master has been updated
via e32b5c95715d9b993864154d9c9d887893921d03 (commit)
from b8d0dbe19e2bb2c60a4708bbe1c2bb694fabb858 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e32b5c95715d9b993864154d9c9d887893921d03
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sat Dec 14 02:23:00 2013 +0100
Some minor fixes on the Debianic init scripts...
-----------------------------------------------------------------------
Summary of changes:
init/x2gobroker-authservice.init | 2 +-
init/x2gobroker-daemon.init | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
The diff of changes is:
diff --git a/init/x2gobroker-authservice.init b/init/x2gobroker-authservice.init
index 79f23af..f34f5a0 100755
--- a/init/x2gobroker-authservice.init
+++ b/init/x2gobroker-authservice.init
@@ -64,7 +64,7 @@ is_true()
case "${1:-}" in
start)
if [ -f $PIDFILE_AUTHSERVICE ]; then
- if ps -u root | grep $(basename $AUTHSERVICE) 1>/dev/null 2>/dev/null; then
+ if ps a -u root | grep $(basename $AUTHSERVICE) 1>/dev/null 2>/dev/null; then
log_warning_msg "X2Go Broker Authentication Service already running"
else
log_warning_msg "X2Go Broker Authentication Service: stale PID file ($PIDFILE_AUTHSERVICE). Delete it manually!"
diff --git a/init/x2gobroker-daemon.init b/init/x2gobroker-daemon.init
index e08921c..932c3a8 100755
--- a/init/x2gobroker-daemon.init
+++ b/init/x2gobroker-daemon.init
@@ -12,7 +12,7 @@
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: X2Go Session Broker standalone daemon
-# Description: X2Go Session Broker daemon comes with its own HTTP daemon
+# Description: X2Go Session Broker comes with its own HTTP daemon
### END INIT INFO
#
@@ -21,8 +21,8 @@ set -eu
DAEMON=/usr/bin/x2gobroker
test -d /run && RUNDIR=/run || RUNDIR=/var/run
PIDFILE_BROKER=$RUNDIR/x2gobroker/x2gobroker-daemon.pid
-DEBIANCONFIG_COMMON=/etc/default/python-x2gobroker
-DEBIANCONFIG_DAEMON=/etc/default/x2gobroker-daemon
+DEFAULTCONFIG_COMMON=/etc/default/python-x2gobroker
+DEFAULTCONFIG_DAEMON=/etc/default/x2gobroker-daemon
test -x "$DAEMON" || exit 0
@@ -38,8 +38,8 @@ X2GOBROKER_AGENT_CMD="/usr/lib/x2go/x2gobroker-agent"
X2GOBROKER_AUTHSERVICE_SOCKET="$RUNDIR/x2gobroker/x2gobroker-authservice.socket"
X2GOBROKER_SSL_CERTFILE=
X2GOBROKER_SSL_KEYFILE=
-test -f $DEBIANCONFIG_COMMON && . $DEBIANCONFIG_COMMON
-test -f $DEBIANCONFIG_DAEMON && . $DEBIANCONFIG_DAEMON
+test -f $DEFAULTCONFIG_COMMON && . $DEFAULTCONFIG_COMMON
+test -f $DEFAULTCONFIG_DAEMON && . $DEFAULTCONFIG_DAEMON
if ! getent passwd $X2GOBROKER_DAEMON_USER 1>/dev/null 2>/dev/null; then
X2GOBROKER_DAEMON_USER=nobody
@@ -82,7 +82,7 @@ is_true()
case "${1:-}" in
start)
if [ -f $PIDFILE_BROKER ]; then
- if ps -u $X2GOBROKER_DAEMON_USER | grep $(basename $DAEMON) 1>/dev/null 2>/dev/null; then
+ if ps a -u $X2GOBROKER_DAEMON_USER | grep $(basename $DAEMON) 1>/dev/null 2>/dev/null; then
log_warning_msg "X2Go Session Broker already running"
else
log_warning_msg "X2Go Session Broker: stale PID file ($PIDFILE_BROKER). Delete it manually!"
hooks/post-receive
--
x2gobroker.git (HTTP(S) Session broker for X2Go)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).
More information about the x2go-commits
mailing list