The branch, build-main has been updated via 3fd14f204a2f570d88c95b455fdcffd57b99ed4e (commit) from 870b98422e7e2ceff6e2f2c5f90172e63109b75a (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 + x2gobroker/authservice.py | 5 ++++- x2gobroker/defaults.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a550fc2..0b12a34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low - For sessions profiles with autologin enable, add a dummy key session profile parameter that triggers key based auth in X2Go Client. (Fixes: #154). + - Fix hard-coded path to x2gobroker's authservice socket. * /debian/control: + Fix --root parameter in DEB_PYTHON_INSTALL_ARGS. * Properly remove the X2Go Session broker log files on package purgal. diff --git a/x2gobroker/authservice.py b/x2gobroker/authservice.py index af47662..bebc2ab 100644 --- a/x2gobroker/authservice.py +++ b/x2gobroker/authservice.py @@ -28,13 +28,16 @@ import socket from pwd import getpwnam from grp import getgrnam +# set up the broker's environment +import x2gobroker.defaults + from loggers import logger_authservice logger_authservice.info('X2Go Session Broker PAM Authentication Service: Setting up the broker\'s environment...') if os.environ.has_key('X2GOBROKER_AUTHSERVICE_SOCKET'): X2GOBROKER_AUTHSERVICE_SOCKET=os.environ['X2GOBROKER_AUTHSERVICE_SOCKET'] else: - X2GOBROKER_AUTHSERVICE_SOCKET="/var/run/x2gobroker-authservice.socket" + X2GOBROKER_AUTHSERVICE_SOCKET="/run/x2gobroker/x2gobroker-authservice.socket" logger_authservice.info(' X2GOBROKER_AUTHSERVICE_SOCKET: {value}'.format(value=X2GOBROKER_AUTHSERVICE_SOCKET)) diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 9e61d83..7f1f3c8 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -77,7 +77,7 @@ else: if os.environ.has_key('X2GOBROKER_AUTHSERVICE_SOCKET'): X2GOBROKER_AUTHSERVICE_SOCKET=os.environ['X2GOBROKER_AUTHSERVICE_SOCKET'] else: - X2GOBROKER_AUTHSERVICE_SOCKET="/var/run/x2gobroker-authservice.socket" + X2GOBROKER_AUTHSERVICE_SOCKET="/run/x2gobroker/x2gobroker-authservice.socket" 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).