[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.0-9-g41a126a

[X2Go dev team]

The branch, master has been updated
       via  41a126a851c6b472283542311ce9ec97a916f887 (commit)
      from  5fb663ba8d36cdcdc1c7f89ef9b3bf75ae22e97f (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 41a126a851c6b472283542311ce9ec97a916f887
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 12 21:31:28 2013 +0200

    Remove old cruft from x2gobroker.conf.

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

Summary of changes:
 debian/changelog    |    1 +
 etc/x2gobroker.conf |   35 +++++++----------------------------
 2 files changed, 8 insertions(+), 28 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3ccf158..c7712eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low
     - In Apache2 vhost configuration example, move WSGI environment
       variable settings into VirtualHost setup.
     - Remove unused, not-yet-developed broker backends and frontends.
+    - Remove old cruft from x2gobroker.conf.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 01 May 2013 21:07:41 +0200
 
diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf
index c698f87..275a486 100644
--- a/etc/x2gobroker.conf
+++ b/etc/x2gobroker.conf
@@ -24,50 +24,31 @@
 
 [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-daemon and
-# x2goserver installed on the same machine. No need to install x2gobroker-agent.
-
-# 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.
-
 # Allow unauthenticated connections? Then set check-credentials to false.
 #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 true
 # to make the X2Go Session Broker require this feature
-#require-cookie-auth = false
+#require-cookie-auth = false ### NOT-IN-USE-YET
 
 # X2Go supports two different cookie authentication modes (static and dynamic).
-#use-static-cookie = false
+#use-static-cookie = false ### NOT-IN-USE-YET
 
 # Every server-client communication (between X2Go Client and broker) has to be
 # accompanied by this initial authentication cookie.
-#my-cookie = <aaaavveeeerrrrryyyyylooonnnnggggssttrrriiinnnggg>
+#my-cookie = <aaaavveeeerrrrryyyyylooonnnnggggssttrrriiinnnggg> ### NOT-IN-USE-YET
 
-# 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
+# X2Go Session Broker knows about two output formats: a text/plain based output
+# and a text/json based output that is compatible with UCCS. The different outputs
+# run under different URLs.
 
 # enable {base_url}/plain/
 #enable-plain-output = true
 
 # enable {base_url}/uccs/
 #enable-uccs-output = false
+
 # use this URL base to create URL field in UCCS-style JSON output
 #my-uccs-url-base = http://localhost:8080/
 
@@ -94,7 +75,6 @@
 #
 # This option can be overridden by the session profile parameter
 # broker-session-autologin={true|false}
-
 #default-session-autologin=false
 
 # X2Go's authorized_keys file for broker mediated autologin sessions
@@ -122,7 +102,6 @@
 #
 # This option can be overridden by the session profile parameter
 # broker-authorized-keys=<file-location>
-
 #default-authorized-keys=%h/.x2go/authorized_keys
 
 # X2Go Broker Agent query mode


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).