The branch, master-inai has been updated via e57e22bfd435d8517b1c346c0c24ad4115805acc (commit) from 051ecfd603383cc3f38b225d36414a4d55928616 (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: etc/x2gobroker.conf | 16 ++++++++++++++-- x2gobroker/defaults.py | 10 ++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index 7004ee2..fdfe5ad 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -78,6 +78,14 @@ enable-json-output = false # enable {base_url}/html/ (THIS IS FUTURE, mg-20121129) enable-html-output = false +# default authentication mechanism for all broker backends +auth-mech = pam + +# how does this X2Go Session Broker instance retrieve user and group information +# from the system? (defaults for all broker backends) +user-db = libnss +group-db = libnss + ### ### configurations for individual session brokers ### @@ -85,16 +93,20 @@ enable-html-output = false [zeroconf] enable = true auth-mech = pam +user-db = libnss +group-db = libnss desktop-shell = KDE [inifile] enable = false -auth-mech = pam session-profiles = /etc/x2go/broker/x2gobroker-sessionprofiles.conf [ldap] enable = false -auth-mech = pam +# override default auth-mech +auth-mech = ldap +user-db = ldap +group-db = ldap uri = ldap://localhost:389 base = dc=example,dc=org user-search-filter = (&(objectClass=posixAccount)(uid=*)) diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 3c561c9..85aaafc 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -57,20 +57,26 @@ X2GOBROKER_CONFIG_DEFAULTS = { 'enable-plain-output': True, 'enable-json-output': False, 'enable-html-output': False, + 'auth-mech': 'pam', + 'user-db': 'libnss', + 'group-db': 'libnss', }, 'zeroconf': { 'enable': True, 'auth-mech': 'pam', + 'user-db': 'libnss', + 'group-db': 'libnss', 'desktop-shell': 'KDE', }, 'inifile': { 'enable': False, - 'auth-mech': 'pam', 'session-profiles': '/etc/x2go/broker/x2gobroker-sessionprofiles.conf', }, 'ldap': { 'enable': False, - 'auth-mech': 'pam', + 'auth-mech': 'ldap', + 'user-db': 'ldap', + 'group-db': 'ldap', 'uri': 'ldap://localhost:389', 'base': 'dc=example,dc=org', 'user-search-filter': '(&(objectClass=posixAccount)(uid=*))', 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).