[X2go-Commits] x2gobroker.git - master (branch) updated: 9adabffa81c28e09169d03ea0df588e926476350

X2Go dev team git-admin at x2go.org
Fri Nov 30 08:31:38 CET 2012


The branch, master has been updated
       via  9adabffa81c28e09169d03ea0df588e926476350 (commit)
      from  a98cb7c746281aaccb47f5d47b51e968e2316fc6 (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 9adabffa81c28e09169d03ea0df588e926476350
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 30 08:30:44 2012 +0100

    draft for possible configuration file

-----------------------------------------------------------------------

Summary of changes:
 etc/x2gobroker.conf    |   86 ++++++++++++++++++++++++++++++++++++++++++++----
 x2gobroker/defaults.py |   38 +++++++++++++++++++++
 2 files changed, 117 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf
index a1b56f5..0123e60 100644
--- a/etc/x2gobroker.conf
+++ b/etc/x2gobroker.conf
@@ -18,14 +18,86 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-[common]
-backend=zeroconf
+###
+### GLOBAL section
+###
+
+[global]
+
+# 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 = simple
+# The Simple X2Go Session Broker backend is for providing session profiles
+# to multiple users/clients on a text config file basis.
+# Authentication is required, make sure you have a working PAM setup. The
+# session profile setup is accomplished by two files, a session profile
+# list and a session profile map. The session profile map defines what user
+# will get offered what session profile(s).
+
+# 3. backend = minibalancer
+# A minimal load balancer for an X2Go server farm. Provide the same set of
+# session profiles to multiple users, optimally without login (set check_credentials
+# to false, below) and offer one of several pre-configured X2Go servers running
+# the same setup.
+
+# 4. backend = ldap
+# 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
+
+# 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
+
+# X2Go supports two different auth ID modes (static and dynamic), for now set the
+# below value to true
+use-static-authid = true
+
+# Make up your own static_authid below...
+static-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}/html/
+enable-html-output = true
+
+# enable {base_url}/json/ (THIS IS FUTURE, mg-20121129)
+enable-json-output = false
+
+###
+### configurations for individual session brokers
+###
+
+[zeroconf]
+enable = true
 
 [simple]
-#...
+enable = false
+session-profiles = /etc/x2go/x2gobroker-simple-sessionprofiles.conf
+session-profiles-map = /etc/x2go/x2gobroker-simple-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
 
 [ldap]
-ldapuri=ldap://<ldapmaster.localdomain>
-#replica=ldapi:///
-binddn="cn=admin,dc=example,dc=net"
-bindpw="<very-secret>"
+enable = false
+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
diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py
index 5357045..d3de516 100644
--- a/x2gobroker/defaults.py
+++ b/x2gobroker/defaults.py
@@ -19,5 +19,43 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
+import uuid
+
 # FIXME: this path must not be hard-coded
 X2GOBROKER_AGENT_CMD="/usr/lib/x2gobroker-agent"
+
+# defaults for X2Go Sessino Broker configuration file
+X2GOBROKER_CONFIG_DEFAULTS = {
+    'global': {
+        'backend': 'zeroconf',
+        'check-credentials': True,
+        'use-authid': False,
+        'use-static-authid': true,
+        'static-authid': uuid.uuid4(),
+        'enable-html-output':  True,
+        'enable-json-output': False,
+    },
+    'zeroconf': {
+        'enable': True,
+    }
+    'simple': {
+        'enable': False,
+        'session-profiles': '/etc/x2go/x2gobroker-simple-sessionprofiles.conf',
+        'session-profiles-map': '/etc/x2go/x2gobroker-simple-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',],
+    }
+    'ldap': {
+        'enable': False,
+        '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).




More information about the x2go-commits mailing list