[X2go-Commits] x2gobroker.git - master (branch) updated: 0.0.0.4-7-g2768dbf

[X2Go dev team]

The branch, master has been updated
       via  2768dbfc6d12dd6f6e57add35208efeedb605147 (commit)
      from  1318e7fd87ac003f9547b4a9337f3ea0f1ac1253 (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 2768dbfc6d12dd6f6e57add35208efeedb605147
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 27 16:35:50 2013 +0100

    Add variable X2GOBROKER_AGENT_USER, so that remote broker agent's can theoretically run under another (i.e. != x2gobroker) user ID.

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

Summary of changes:
 debian/changelog                 |    3 +++
 debian/python-x2gobroker.default |    4 ++++
 x2gobroker/agent.py              |    2 +-
 x2gobroker/defaults.py           |    4 ++++
 4 files changed, 12 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e5bd37e..82e3701 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ x2gobroker (0.0.0.5-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (0.0.0.5):
     - Prepare for WSGI based integration into an external httpd.
     - Monkey patch Paramiko/SSH (adopted from Python X2Go).
+    - Add variable X2GOBROKER_AGENT_USER, so that remote broker
+      agent's can theoretically run under another (i.e. != x2gobroker)
+      user ID.
   * /debian/control:
     + Add dependency to python-x2gobroker: python-paramiko.
   * /debian/x2gobroker-daemon.default:
diff --git a/debian/python-x2gobroker.default b/debian/python-x2gobroker.default
index f34e313..0907b79 100644
--- a/debian/python-x2gobroker.default
+++ b/debian/python-x2gobroker.default
@@ -7,6 +7,10 @@
 #X2GOBROKER_DAEMON_USER=x2gobroker
 #X2GOBROKER_DAEMON_GROUP=x2gobroker
 
+# The posix user under which the x2gobroker-agent can be launched on
+# remote X2Go Servers.
+#X2GOBROKER_AGENT_USER=x2gobroker
+
 # Run X2Go Session Broker in debug mode, this will make the broker
 # available through http GET method calls (otherwise: POST method
 # only) and you will be able to test the broker through your web
diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index 7fbc5f5..db7fcbc 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -75,7 +75,7 @@ def call_remote_broker_agent(username, mode, remote_agent):
         '{mode}'.format(mode=mode),
     ]
 
-    remote_username = x2gobroker.defaults.X2GOBROKER_USER
+    remote_username = x2gobroker.defaults.X2GOBROKER_AGENT_USER
     remote_hostname = remote_agent[u'hostname']
     remote_port = int(remote_agent[u'port'])
 
diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py
index 6c377c4..cd0dfd7 100644
--- a/x2gobroker/defaults.py
+++ b/x2gobroker/defaults.py
@@ -34,6 +34,10 @@ if os.environ.has_key('X2GOBROKER_DAEMON_GROUP'):
     X2GOBROKER_DAEMON_GROUP=os.environ['X2GOBROKER_DAEMON_GROUP']
 else:
     X2GOBROKER_DAEMON_GROUP="x2gobroker"
+if os.environ.has_key('X2GOBROKER_AGENT_USER'):
+    X2GOBROKER_AGENT_USER=os.environ['X2GOBROKER_AGENT_USER']
+else:
+    X2GOBROKER_AGENT_USER="x2gobroker"
 
 ###
 ### dynamic default values, influencable through os.environ...


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).