This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 4b068176dd9dd48c7d1a0e105ed24e110ab9f3c4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 30 14:43:57 2015 +0200 fix-up of still-completely flawed x2gobroker-loadchecker.init script (Debian) --- init/x2gobroker-loadchecker.init | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/init/x2gobroker-loadchecker.init b/init/x2gobroker-loadchecker.init index de8f2d0..8be4381 100755 --- a/init/x2gobroker-loadchecker.init +++ b/init/x2gobroker-loadchecker.init @@ -1,6 +1,6 @@ #!/bin/sh # -# Start the X2Go Session Broker PAM Authentication Service +# Start the X2Go Session Broker Load Checker Service # # Copyright © 2014 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # Distributable under the terms of the GNU AGPL version 3+. @@ -11,8 +11,8 @@ # Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: X2Go Session Broker PAM Authentication Service -# Description: PAM authentication service for X2Go Session Broker +# Short-Description: X2Go Session Broker Load Checker Service +# Description: Load Checker service for X2Go Session Broker ### END INIT INFO # @@ -64,10 +64,10 @@ is_true() case "${1:-}" in start) if [ -f $PIDFILE_LOADCHECKER ]; then - if ps a -u root | grep -v egrep | egrep ".*$(basename $LOADCHECKER).*$X2GOBROKER_LOADCHECKER_SOCKET.*" 1>/dev/null 2>/dev/null; then - log_warning_msg "X2Go Broker Authentication Service already running" + if ps a -u $X2GOBROKER_DAEMON_USER | grep -v egrep | egrep ".*$(basename $LOADCHECKER).*$X2GOBROKER_LOADCHECKER_SOCKET.*" 1>/dev/null 2>/dev/null; then + log_warning_msg "X2Go Broker Load Checker Service already running" else - log_warning_msg "X2Go Broker Authentication Service: stale PID file ($PIDFILE_LOADCHECKER). Delete it manually!" + log_warning_msg "X2Go Broker Load Checker Service: stale PID file ($PIDFILE_LOADCHECKER). Delete it manually!" fi START_LOADCHECKER=no fi @@ -76,15 +76,15 @@ case "${1:-}" in # once we are here, we have to make sure the loadchecker.socket does not exist rm -f $X2GOBROKER_LOADCHECKER_SOCKET # and now we can start the auth service - log_daemon_msg "Starting X2Go Broker Authentication Service" "$(basename $LOADCHECKER)" - start-stop-daemon -b -m -S -p $PIDFILE_LOADCHECKER -x $LOADCHECKER -- -s $X2GOBROKER_LOADCHECKER_SOCKET -o $X2GOBROKER_DAEMON_USER -g $X2GOBROKER_DAEMON_GROUP -p 0660 + log_daemon_msg "Starting X2Go Broker Load Checker Service" "$(basename $LOADCHECKER)" + start-stop-daemon --chuid $X2GOBROKER_DAEMON_USER -b -m -S -p $PIDFILE_LOADCHECKER -x $LOADCHECKER -- -s $X2GOBROKER_LOADCHECKER_SOCKET -o $X2GOBROKER_DAEMON_USER -g $X2GOBROKER_DAEMON_GROUP -p 0660 log_end_msg $? set -e fi ;; stop) if [ -f $PIDFILE_LOADCHECKER ] ; then - log_daemon_msg "Stopping X2Go Broker Authentication Service" "$(basename $LOADCHECKER)" + log_daemon_msg "Stopping X2Go Broker Load Checker Service" "$(basename $LOADCHECKER)" set +e start-stop-daemon -K -p $PIDFILE_LOADCHECKER && rm -f $PIDFILE_LOADCHECKER log_end_msg $? -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git