The branch, build-main has been updated via 80fd7e03f7094ef1dcc3e61d9d4e30a5020ed78a (commit) from b5df92c61e0c84ec314b29acc60e635d43f3b7b0 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/x2gobroker-daemon.default | 3 +++ debian/x2gobroker-daemon.init | 4 +++- x2gobroker/loggers.py | 6 ++++-- 4 files changed, 11 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9ed8b0d..467aa58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low - Add foundation for logging support. - Add man page for x2gobroker executable. - Add logrotate configuration for x2gobroker log files. + - Make the daemon user ID configurable through x2gobroker-daemon.default. * /debian/control: + Add bin:package x2gobroker-agent. diff --git a/debian/x2gobroker-daemon.default b/debian/x2gobroker-daemon.default index 452a75b..589aedb 100644 --- a/debian/x2gobroker-daemon.default +++ b/debian/x2gobroker-daemon.default @@ -3,6 +3,9 @@ # Uncomment to enable the X2Go Session Broker standalone daemon START_DAEMON=true +# the posix user ID the broker runs under +#X2GOBROKER_DAEMON_USER=x2gobroker + # run XGo Session Broker in debug mode, this will make the broker # available through http GET method calls (otherwise: POST method # only) and you will be able to test the broker through your web diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init index d14bb8f..4d89e64 100644 --- a/debian/x2gobroker-daemon.init +++ b/debian/x2gobroker-daemon.init @@ -28,6 +28,7 @@ test -x "$DAEMON" || exit 0 START_DAEMON=false DAEMON_BIND_ADDRESS=127.0.0.1:8080 X2GOBROKER_DEBUG=0 +X2GOBROKER_DAEMON_USER='x2gobroker' X2GOBROKER_DEFAULT_BACKEND="zeroconf" X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf" @@ -37,6 +38,7 @@ X2GOBROKER_SSL_KEYFILE= test -f $DEBIANCONFIG && . $DEBIANCONFIG export X2GOBROKER_DEBUG +export X2GOBROKER_DAEMON_USER export X2GOBROKER_CONFIG export X2GOBROKER_DEFAULT_BACKEND export X2GOBROKER_SESSIONPROFILES @@ -60,7 +62,7 @@ case "${1:-}" in log_daemon_msg "Starting X2Go Session Broker standalone daemon" "x2gobroker" mkdir -p $RUNDIR set +e - start-stop-daemon -b -m -S -p $PIDFILE -x $DAEMON -- -b $DAEMON_BIND_ADDRESS + start-stop-daemon -u $X2GOBROKER_DAEMON_USER -b -m -S -p $PIDFILE -x $DAEMON -- -b $DAEMON_BIND_ADDRESS log_end_msg $? set -e fi diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index e35a9a7..94e00ec 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -25,9 +25,11 @@ import getpass import logging import logging.config -X2GOBROKER_DAEMON_USER = 'x2gobroker' - # normally this would go into defaults.py, however, we do not want to create a dependency loop between loggers.py and defaults.py... +if os.environ.has_key('X2GOBROKER_DAEMON_USER'): + X2GOBROKER_DAEMON_USER=os.environ['X2GOBROKER_DAEMON_USER'] +else: + X2GOBROKER_DAEMON_USER="x2gobroker" if os.environ.has_key('X2GOBROKER_LOGCONFIG'): X2GOBROKER_LOGCONFIG=os.environ['X2GOBROKER_LOGCONFIG'] else: 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).