[X2Go-Commits] x2gobroker.git - master-inai (branch) updated: 0.0.0.1-4-gd424e12

[X2Go dev team]

The branch, master-inai has been updated
       via  d424e129de63d2fd187d1364bf5d2791d74571be (commit)
      from  dc84423e202eba6c1022821b24a25504ee1cab0c (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 +
 etc/broker/x2gobroker-sessionprofiles.conf |    3 +--
 x2gobroker/brokers/base_broker.py          |    2 +-
 x2gobroker/defaults.py                     |    2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 573259f..025cc4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low
 
   * New upstream version (0.0.0.2):
     - Make CC, CFLAGS and LDFLAGS configurable through build system.
+    - Make host session option a list, not string.
   * /debian/control:
     + Add bin:package x2gobroker-agent.
 
diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf
index 8b332a3..f84e097 100644
--- a/etc/broker/x2gobroker-sessionprofiles.conf
+++ b/etc/broker/x2gobroker-sessionprofiles.conf
@@ -144,8 +144,7 @@ acl-any-order=deny-allow
 [pool-C-XFCE]
 user=
 # no load balancing support, yet
-#host=s-E1.pool-c.domain.local,s-E2.pool-c.domain.local,s-E3.pool-c.domain.local,s-E4.pool-c.domain.local,s-E5.pool-c.domain.local,s-E6.pool-c.domain.local
-host=s-E1.pool-c.domain.local
+host=s-E1.pool-c.domain.local,s-E2.pool-c.domain.local,s-E3.pool-c.domain.local,s-E4.pool-c.domain.local,s-E5.pool-c.domain.local,s-E6.pool-c.domain.local
 name=XFCE - pool-C
 command=XFCE
 acl-users-allow=testuser-A,testuser-B
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 7da6336..c06dfa6 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -699,7 +699,7 @@ class X2GoBroker(object):
         profile = self.get_profile(profile_id)
 
         selected_session = {
-            'server': profile[u'host'],
+            'server': profile[u'host'][0],
             'port': profile[u'sshport'],
         }
 
diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py
index 63bc254..48b61d8 100644
--- a/x2gobroker/defaults.py
+++ b/x2gobroker/defaults.py
@@ -139,6 +139,8 @@ X2GOBROKER_SESSIONPROFILE_DEFAULTS = {
         u'sshport': 22,
         u'setdpi': 0,
         u'pack': u'16m-jpeg',
+        u'user': '',
+        u'host': [ u'localhost', ],
         u'acl-users-allow': [],
         u'acl-users-deny': [],
         u'acl-users-order': '',


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