The branch, build-main has been updated via a8dbd6b888cf3b9321ecd42086defc68532e774f (commit) from 38cb739cadb423bfbc6fc4a0b71473ec3859550b (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 | 2 ++ x2gobroker/defaults.py | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a78bfda..c9d5d8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low backend name. - In WSGI mode: only populate os.environ with variables matching »X2GOBROKER_*«. + - Make X2GOBROKER_SESSIONPROFILES configurable through a SetEnv WSGI + parameter in the httpd configuration. (Fixes: #210). * Provide init scripts and *.default files outside of /debian folder (as they are also relevant for non-Debian packaging). diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index f46e1b8..7d81b76 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -67,7 +67,10 @@ if os.environ.has_key('X2GOBROKER_CONFIG'): else: X2GOBROKER_CONFIG = "/etc/x2go/x2gobroker.conf" -X2GOBROKER_SESSIONPROFILES = "/etc/x2go/broker/x2gobroker-sessionprofiles.conf" +if os.environ.has_key('X2GOBROKER_SESSIONPROFILES'): + X2GOBROKER_SESSIONPROFILES = os.environ['X2GOBROKER_SESSIONPROFILES'] +else: + X2GOBROKER_SESSIONPROFILES = "/etc/x2go/broker/x2gobroker-sessionprofiles.conf" if os.environ.has_key('X2GOBROKER_AGENT_CMD'): X2GOBROKER_AGENT_CMD = os.environ['X2GOBROKER_AGENT_CMD'] @@ -103,9 +106,6 @@ if socket.gethostname().find('.') >= 0: else: X2GOBROKER_HOSTNAME = socket.gethostbyaddr(socket.gethostname())[0] - -X2GOBROKER_SESSIONPROFILES = "/etc/x2go/broker/x2gobroker-sessionprofiles.conf" - # the home directory of the user that the daemon/cgi runs as X2GOBROKER_HOME = os.path.normpath(os.path.expanduser('~{broker_uid}'.format(broker_uid=X2GOBROKER_DAEMON_USER))) 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).