The branch, master-inai has been updated via b045b4d4ad0c548faa15be947050da2481fb73ca (commit) from 3f8bd5f94d58566385272da0e06113c46da8c593 (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: x2gobroker/config.py | 15 +++--- x2gobroker/defaults.py | 139 +++++++++++++++++++++++++----------------------- 2 files changed, 80 insertions(+), 74 deletions(-) The diff of changes is: diff --git a/x2gobroker/config.py b/x2gobroker/config.py index a2979ab..90adbf8 100644 --- a/x2gobroker/config.py +++ b/x2gobroker/config.py @@ -209,13 +209,13 @@ class X2GoBrokerConfigFile(object): @rtype: class """ - if section in self.defaultValues.keys(): + if section in self.defaultValues.keys() and key in self.defaultValues[section].keys(): return type(self.defaultValues[section][key]) else: try: return type(self.defaultValues['DEFAULT'][key]) except KeyError: - return None + return type(u'') def has_value(self, section, key): """\ @@ -279,7 +279,7 @@ class X2GoBrokerConfigFile(object): else: _val = self.iniConfig.get(section, key) - return _val.decode(x2gobroker.utils.get_encoding()) + return _val get = get_value __call__ = get_value @@ -295,10 +295,13 @@ class X2GoBrokerConfigFile(object): _ini_defaults = self.iniConfig.defaults() for option in _ini_defaults.keys(): try: - _my_defaults[option] = self.get('DEFAULT', option, key_type=self.get_type('DEFAULT', option)) + _my_defaults[unicode(option)] = self.get('DEFAULT', option, key_type=self.get_type('DEFAULT', option)) except KeyError: continue + try: del _my_defaults[u'default'] + except KeyError: pass + return _my_defaults @@ -316,7 +319,7 @@ class X2GoBrokerConfigFile(object): _section_config = {} for option in self.iniConfig.options(section): if option not in self.iniConfig.sections(): - _section_config[option] = self.get(section, option, key_type=self.get_type(section, option)) + _section_config[unicode(option)] = self.get(section, option, key_type=self.get_type(section, option)) return _section_config @@ -328,7 +331,7 @@ class X2GoBrokerConfigFile(object): @rtype: C{list} """ - return self.iniConfig.sections() + return [ unicode(s) for s in self.iniConfig.sections() ] @property def printable_config_file(self): diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 85aaafc..ef9b759 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -49,85 +49,88 @@ else: # defaults for X2Go Sessino Broker configuration file X2GOBROKER_CONFIG_DEFAULTS = { 'global': { - 'backend': 'zeroconf', - 'check-credentials': True, - 'use-authid': False, - 'use-static-authid': True, - 'authid': uuid.uuid4(), - 'enable-plain-output': True, - 'enable-json-output': False, - 'enable-html-output': False, - 'auth-mech': 'pam', - 'user-db': 'libnss', - 'group-db': 'libnss', + u'backend': u'zeroconf', + u'check-credentials': True, + u'use-authid': False, + u'use-static-authid': True, + u'authid': uuid.uuid4(), + u'enable-plain-output': True, + u'enable-json-output': False, + u'enable-html-output': False, + u'default-auth-mech': u'pam', + u'default-user-db': u'libnss', + u'default-group-db': u'libnss', }, 'zeroconf': { - 'enable': True, - 'auth-mech': 'pam', - 'user-db': 'libnss', - 'group-db': 'libnss', - 'desktop-shell': 'KDE', + u'enable': True, + u'auth-mech': u'pam', + u'user-db': u'libnss', + u'group-db': u'libnss', + u'desktop-shell': u'KDE', }, 'inifile': { - 'enable': False, - 'session-profiles': '/etc/x2go/broker/x2gobroker-sessionprofiles.conf', + u'enable': False, + u'session-profiles': u'/etc/x2go/broker/x2gobroker-sessionprofiles.conf', + u'auth-mech': u'', + u'user-db': u'', + u'group-db': u'', }, 'ldap': { - 'enable': False, - 'auth-mech': 'ldap', - 'user-db': 'ldap', - 'group-db': 'ldap', - 'uri': 'ldap://localhost:389', - 'base': 'dc=example,dc=org', - 'user-search-filter': '(&(objectClass=posixAccount)(uid=*))', - 'host-search-filter': '(&(objectClass=ipHost)(serial=X2GoServer)(cn=*))', - 'group-search-filter': '(&(objectClass=posifxGroup)(cn=*))', - 'starttls': False, + u'enable': False, + u'auth-mech': u'ldap', + u'user-db': u'ldap', + u'group-db': u'ldap', + u'uri': u'ldap://localhost:389', + u'base': u'dc=example,dc=org', + u'user-search-filter': u'(&(objectClass=posixAccount)(uid=*))', + u'host-search-filter': u'(&(objectClass=ipHost)(serial=X2GoServer)(cn=*))', + u'group-search-filter': u'(&(objectClass=posifxGroup)(cn=*))', + u'starttls': False, }, } # defaults for X2Go Sessino Broker session profiles file X2GOBROKER_SESSIONPROFILE_DEFAULTS = { 'DEFAULT': { - 'defsndport': True, - 'useiconv': False, - 'iconvfrom': 'UTF-8', - 'height': 600, - 'export': '', - 'quality': 9, - 'fullscreen': False, - 'layout': '', - 'useexports': True, - 'width': 800, - 'speed': 2, - 'soundsystem': 'pulse', - 'print': True, - 'type': 'auto', - 'sndport': 4713, - 'xinerama': True, - 'variant': '', - 'usekbd': True, - 'fstunnel': True, - 'applications': ['TERMINAL','WWWBROWSER','MAILCLIENT','OFFICE'], - 'multidisp': False, - 'sshproxyport': 22, - 'sound': True, - 'rootless': False, - 'iconvto': 'UTF-8', - 'soundtunnel': True, - 'dpi': 96, - 'sshport': 22, - 'setdpi': 0, - 'pack': '16m-jpeg', - 'acl-users-allow': ['ALL'], - 'acl-users-deny': [], - 'acl-users-order': '', - 'acl-groups-allow': ['ALL'], - 'acl-groups-deny': [], - 'acl-groups-order': '', - 'acl-clients-allow': ['ALL'], - 'acl-clients-deny': [], - 'acl-clients-order': '', - 'acl-any-order': 'deny-allow', + u'defsndport': True, + u'useiconv': False, + u'iconvfrom': u'UTF-8', + u'height': 600, + u'export': u'', + u'quality': 9, + u'fullscreen': False, + u'layout': u'', + u'useexports': True, + u'width': 800, + u'speed': 2, + u'soundsystem': u'pulse', + u'print': True, + u'type': u'auto', + u'sndport': 4713, + u'xinerama': True, + u'variant': u'', + u'usekbd': True, + u'fstunnel': True, + u'applications': [u'TERMINAL',u'WWWBROWSER',u'MAILCLIENT',u'OFFICE'], + u'multidisp': False, + u'sshproxyport': 22, + u'sound': True, + u'rootless': False, + u'iconvto': u'UTF-8', + u'soundtunnel': True, + u'dpi': 96, + u'sshport': 22, + u'setdpi': 0, + u'pack': u'16m-jpeg', + u'acl-users-allow': [u'ALL'], + u'acl-users-deny': [], + u'acl-users-order': '', + u'acl-groups-allow': [u'ALL'], + u'acl-groups-deny': [], + u'acl-groups-order': '', + u'acl-clients-allow': [u'ALL'], + u'acl-clients-deny': [], + u'acl-clients-order': '', + u'acl-any-order': u'deny-allow', }, } 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).