The branch, master-inai has been updated via 3f8bd5f94d58566385272da0e06113c46da8c593 (commit) from e57e22bfd435d8517b1c346c0c24ad4115805acc (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 | 78 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 30 deletions(-) The diff of changes is: diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index fdfe5ad..0f30078 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -49,67 +49,85 @@ # A production backend that stores all session profile, server and session # profile mapping in LDAP -backend = zeroconf # Allow unauthenticated connections? Then set check_credentials to false (i.e. 0) -check-credentials = true +#check-credentials = true # To secure server-client communication the client can start the communication # with a pre-set, agreed on authentication ID. Set the below value to 1 to make # use of this feature -use-authid = false +#use-authid = false # X2Go supports two different auth ID modes (static and dynamic), for now set the # below value to true -use-static-authid = true +#use-static-authid = true # Make up your own authid below... -authid = <aaaavveeeerrrrryyyyylooonnnnggggssttrrriiinnnggg> +#authid = <aaaavveeeerrrrryyyyylooonnnnggggssttrrriiinnnggg> # X2Go Session Broker knows about two output formats: a text/html based output # and a text/json based output. The different outputs run under different URLs # enable {base_url}/plain/ -enable-plain-output = true +#enable-plain-output = true # enable {base_url}/json/ (THIS IS FUTURE, mg-20121129) -enable-json-output = false +#enable-json-output = false # enable {base_url}/html/ (THIS IS FUTURE, mg-20121129) -enable-html-output = false +#enable-html-output = false # default authentication mechanism for all broker backends -auth-mech = pam +#default-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 +#default-user-db = libnss +#default-group-db = libnss ### -### configurations for individual session brokers +### BACKEND section ### +# Possible X2Go Session Broker backends: +# +# 1. backend = zeroconf +# Use the ZeroConf X2Go Session Broker backend, this backend is for demo only +# and only operates on localhost. Make sure you have x2gobroker, x2gobroker-agent +# and x2goserver installed on the same machine. + +# 2. backend = infile +# The IniFile X2Go Session Broker backend is for providing session profiles +# to multiple users/clients on a text config file basis. +# +# The session profile setup is accomplished by an extra configuration file, +# by default named /etc/x2go/x2gobroker-sessionproiles.conf. +# +# For small-scale deployments the IniFile backend is the recommended backend. + +# 4. backend = ldap +# A production backend that stores all session profile, server and session +# profile mapping in LDAP (MUSIC OF THE FUTURE!!!) + [zeroconf] -enable = true -auth-mech = pam -user-db = libnss -group-db = libnss -desktop-shell = KDE +#enable = true +#auth-mech = pam +#user-db = libnss +#group-db = libnss +#desktop-shell = KDE [inifile] -enable = false -session-profiles = /etc/x2go/broker/x2gobroker-sessionprofiles.conf +#enable = false +#session-profiles = /etc/x2go/broker/x2gobroker-sessionprofiles.conf [ldap] -enable = false -# 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=*)) -host-search-filter = (&(objectClass=ipHost)(serial=X2GoServer)(cn=*)) -group-search-filter = (&(objectClass=posifxGroup)(cn=*)) -starttls = false +#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 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).