The branch, master has been updated via 7fef53d554f5f748f9a15c35779ecb4f84056199 (commit) from 9c782c9482056c88eac22a6e6ac44bf67f7b971d (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 7fef53d554f5f748f9a15c35779ecb4f84056199 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Dec 20 10:58:46 2013 +0100 Detect RUNDIR in x2gobroker-authservice and use it for the default location of the authservice socket file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ sbin/x2gobroker-authservice | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6507211..c42c9e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -69,6 +69,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Make the inifile broker backend the default backend. - Support daemonizing of the http broker. - Support daemonizing of the authservice. + - Detect RUNDIR in x2gobroker-authservice 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/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice index 8de7308..251de86 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -32,14 +32,15 @@ import getpass import logging.config import pam +if os.path.isdir('/run'): + RUNDIR = '/run' +else: + RUNDIR = '/var/run' + try: import daemon import lockfile CAN_DAEMONIZE = True - if os.path.isdir('/run'): - RUNDIR = '/run' - else: - RUNDIR = '/var/run' pidfile = '{run}/x2gobroker/x2gobroker-authservice.pid'.format(run=RUNDIR) daemon_logdir = '/var/log/x2gobroker/' except ImportError: @@ -125,7 +126,7 @@ 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" + X2GOBROKER_AUTHSERVICE_SOCKET="{run}/x2gobroker/x2gobroker-authservice.socket".format(run=RUNDIR) # standalone daemon mode (x2gobroker-authservice as daemon) or interactive mode (called from the cmdline)? if getpass.getuser() in (X2GOBROKER_DAEMON_USER, 'root'): 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).