The branch, master has been updated via fc8d5d8412bcef24ae31bc571788baf0605cee30 (commit) from 7fef53d554f5f748f9a15c35779ecb4f84056199 (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 fc8d5d8412bcef24ae31bc571788baf0605cee30 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Dec 20 11:00:54 2013 +0100 Detect RUNDIR in x2gobroker Python module and use it for the default location of the authservice socket file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2gobroker/defaults.py | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c42c9e2..0e2cf9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,6 +71,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Support daemonizing of the authservice. - Detect RUNDIR in x2gobroker-authservice and use it for the default location of the authservice socket file. + - Detect RUNDIR in x2gobroker Python module and use it for the default + location of the authservice socket file. * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Fix SYNOPSIS texts. diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 9087027..064acdb 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -84,7 +84,11 @@ else: if os.environ.has_key('X2GOBROKER_AUTHSERVICE_SOCKET'): X2GOBROKER_AUTHSERVICE_SOCKET=os.environ['X2GOBROKER_AUTHSERVICE_SOCKET'] else: - X2GOBROKER_AUTHSERVICE_SOCKET="/run/x2gobroker/x2gobroker-authservice.socket" + if os.path.isdir('/run'): + RUNDIR = '/run' + else: + RUNDIR = '/var/run' + X2GOBROKER_AUTHSERVICE_SOCKET="{run}/x2gobroker/x2gobroker-authservice.socket".format(run=RUNDIR) if os.environ.has_key('X2GOBROKER_DEFAULT_BACKEND'): X2GOBROKER_DEFAULT_BACKEND = os.environ['X2GOBROKER_DEFAULT_BACKEND'] 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).