The branch, master has been updated via d7fac0cdf9f44dcbf752f2f0fcabe262c804efa5 (commit) from 9d21d6fd245e25e7bbb2cb8caf9cfc316b10017a (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 d7fac0cdf9f44dcbf752f2f0fcabe262c804efa5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Dec 5 01:03:39 2012 +0100 adapt x2gobroker.conf to renaming of the new inifile backend ----------------------------------------------------------------------- Summary of changes: etc/x2gobroker.conf | 10 ++-------- x2gobroker/defaults.py | 12 +++--------- 2 files changed, 5 insertions(+), 17 deletions(-) The diff of changes is: diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index 840508e..b453a7a 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -88,14 +88,8 @@ desktop-shell = KDE [singlenodes] enable = false -session-profiles = /etc/x2go/broker/x2gobroker-singlenodes-sessionprofiles.conf -session-profiles-map = /etc/x2go/broker/x2gobroker-singlenodes-sessionprofilesmap.conf - -[loadbalancer] -enable = false -session-profiles = /etc/x2go/x2gobroker-loadbalancer-sessionprofiles.conf -server-list-PROFILENAME1 = server1.profile1.mydomain.tld, server2.profile1.mydomain.tld, server3.profile1.mydomain.tld -server-list-PROFILENAME2 = server1.profile2.mydomain.tld, server2.profile2.mydomain.tld +session-profiles = /etc/x2go/broker/x2gobroker-sessionprofiles.conf +session-profiles-map = /etc/x2go/broker/x2gobroker-sessionprofilesmap.conf [ldap] enable = false diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 009129f..d1bbd35 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -53,16 +53,10 @@ X2GOBROKER_CONFIG_DEFAULTS = { 'enable': True, 'desktop-shell': 'KDE', }, - 'singlenodes': { + 'inifile': { 'enable': False, - 'session-profiles': '/etc/x2go/broker/x2gobroker-singlenodes-sessionprofiles.conf', - 'session-profiles-map': '/etc/x2go/broker/x2gobroker-singlenodes-sessionprofilesmap.conf', - }, - 'loadbalancer': { - 'enable': False, - 'session-profiles': '/etc/x2go/x2gobroker-loadbalancer-sessionprofiles.conf', - 'server-list-PROFILENAME1': ['server1.profile1.mydomain.tld','server2.profile1.mydomain.tld','server3.profile1.mydomain.tld',], - 'server-list-PROFILENAME2': ['server1.profile2.mydomain.tld','server2.profile2.mydomain.tld',], + 'session-profiles': '/etc/x2go/broker/x2gobroker-sessionprofiles.conf', + 'session-profiles-map': '/etc/x2go/broker/x2gobroker-sessionprofilesmap.conf', }, 'ldap': { 'enable': False, 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).