The branch, master has been updated via f7e9cc7089a4e6e78e855d7f404094acf800fa81 (commit) via b9ada0c1fadd3eae4c7cbf1fd101eeea10398020 (commit) from e4c48da663e47c7fa1afc0892effdb871c93d027 (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 f7e9cc7089a4e6e78e855d7f404094acf800fa81 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Nov 29 15:38:44 2012 +0100 fork web.py process to background in x2gobroker-daemon.init script commit b9ada0c1fadd3eae4c7cbf1fd101eeea10398020 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Nov 29 15:38:25 2012 +0100 add defaults.py ----------------------------------------------------------------------- Summary of changes: debian/x2gobroker-daemon.init | 2 +- x2gobroker/{__init__.py => defaults.py} | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) copy x2gobroker/{__init__.py => defaults.py} (84%) The diff of changes is: diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init index 9901128..59e868b 100644 --- a/debian/x2gobroker-daemon.init +++ b/debian/x2gobroker-daemon.init @@ -44,7 +44,7 @@ case "${1:-}" in log_daemon_msg "Starting X2Go Session Broker standalone daemon" "x2gobroker" mkdir -p $RUNDIR set +e - start-stop-daemon -S -p $PIDFILE -x $DAEMON + start-stop-daemon -b -S -p $PIDFILE -x $DAEMON log_end_msg $? set -e fi diff --git a/x2gobroker/__init__.py b/x2gobroker/defaults.py similarity index 84% copy from x2gobroker/__init__.py copy to x2gobroker/defaults.py index ad8c1e4..5357045 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/defaults.py @@ -2,6 +2,7 @@ # Copyright (C) 2012 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2012 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -18,6 +19,5 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.0.0.1' - - +# FIXME: this path must not be hard-coded +X2GOBROKER_AGENT_CMD="/usr/lib/x2gobroker-agent" 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).