[X2go-Commits] x2gobroker.git - master (branch) updated: 09cfdcfa2042e4bef78b091fbd4ad7fa278454e8

[X2Go dev team]

The branch, master has been updated
       via  09cfdcfa2042e4bef78b091fbd4ad7fa278454e8 (commit)
       via  537b3ae070b91abb24310ea17eb90637e8c093df (commit)
      from  c37de1ec00c8790cb5f4c7258ae12021e3d38c7a (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 09cfdcfa2042e4bef78b091fbd4ad7fa278454e8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Dec 6 11:22:40 2012 +0100

    add env vars X2GOBROKER_CONFIG, X2GOBROKER_SESSIONPROFILES to Debian-specific daemon startup mechanism

commit 537b3ae070b91abb24310ea17eb90637e8c093df
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Dec 6 11:22:00 2012 +0100

    do not hard-code /etc/x2go/x2gobroker-sessionprofiles.conf anymore, make it configurable through os.environ

-----------------------------------------------------------------------

Summary of changes:
 debian/x2gobroker-daemon.default |    8 +++++++-
 debian/x2gobroker-daemon.init    |    2 ++
 x2gobroker/backends/inifile.py   |    3 ++-
 x2gobroker/defaults.py           |    5 +++++
 4 files changed, 16 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/x2gobroker-daemon.default b/debian/x2gobroker-daemon.default
index 1e542e5..19130fa 100644
--- a/debian/x2gobroker-daemon.default
+++ b/debian/x2gobroker-daemon.default
@@ -6,8 +6,14 @@ START_DAEMON=true
 # bind standalone daemon to this address:port
 #DAEMON_BIND_ADDRESS=127.0.0.1:8080
 
-# default X2Go Session Broker backend
+# default X2Go Session Broker backend (available: zeroconf, inifile)
 #X2GOBROKER_DEFAULT_BACKEND=zeroconf
 
+# path to the X2Go Session Broker's configuration file
+#X2GOBROKER_CONFIG=/etc/x2go/x2gobroker.conf
+
+# path to the X2Go Session Broker's session profiles file (when using the inifile backend)
+#X2GOBROKER_SESSIONPROFILES=/etc/x2go/x2gobroker-sessionprofiles.conf
+
 # path to the X2Go Session Broker's agent command
 #X2GOBROKER_AGENT_CMD=/usr/lib/x2go/x2gobroker-agent
diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init
index 0b0fae4..8772320 100644
--- a/debian/x2gobroker-daemon.init
+++ b/debian/x2gobroker-daemon.init
@@ -28,6 +28,8 @@ test -x "$DAEMON" || exit 0
 START_DAEMON=false
 DAEMON_BIND_ADDRESS=127.0.0.1:8080
 X2GOBROKER_DEFAULT_BACKEND="zeroconf"
+X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf"
+X2GOBROKER_SESSIONPROFILES="/etc/x2go/x2gobroker-sessionprofiles.conf"
 X2GOBROKER_AGENT_CMD="/usr/lib/x2go/x2gobroker-agent"
 test -f $DEBIANCONFIG && . $DEBIANCONFIG
 
diff --git a/x2gobroker/backends/inifile.py b/x2gobroker/backends/inifile.py
index 247234f..6505150 100644
--- a/x2gobroker/backends/inifile.py
+++ b/x2gobroker/backends/inifile.py
@@ -30,6 +30,7 @@ __NAME__ = 'x2gobroker-pylib'
 # Python X2GoBroker modules
 import base
 import x2gobroker.config
+import x2gobroker.defaults
 
 class X2GoBroker(base.X2GoBroker):
     """\
@@ -39,7 +40,7 @@ class X2GoBroker(base.X2GoBroker):
 
     backend_name = 'inifile'
 
-    def __init__(self, profile_config='/etc/x2go/x2gobroker-sessionprofiles.conf', **kwargs):
+    def __init__(self, profile_config=x2gobroker.defaults.X2GOBROKER_SESSIONPROFILES, **kwargs):
         """\
 
         @param config_file: path to the X2Go Session Broker configuration file (x2gobroker.conf)
diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py
index 25b3e6f..5a10a95 100644
--- a/x2gobroker/defaults.py
+++ b/x2gobroker/defaults.py
@@ -31,6 +31,11 @@ if os.environ.has_key('X2GOBROKER_CONFIG'):
 else:
     X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf"
 
+if os.environ.has_key('X2GOBROKER_SESSIONPROFILES'):
+    X2GOBROKER_SESSIONPROFILES=os.environ['X2GOBROKER_SESSIONPROFILES']
+else:
+    X2GOBROKER_SESSIONPROFILES="/etc/x2go/x2gobroker-sessionprofiles.conf"
+
 if os.environ.has_key('X2GOBROKER_AGENT_CMD'):
     X2GOBROKER_AGENT_CMD=os.environ['X2GOBROKER_AGENT_CMD']
 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).