[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-112-gd9ce73f
X2Go dev team
git-admin at x2go.org
Wed Dec 18 23:12:17 CET 2013
The branch, master has been updated
via d9ce73f4f90b80554dea629dcf64bb1f65b65f4b (commit)
from 017051d5dd79d540c9240ed7d69c6e4258ec02f7 (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 d9ce73f4f90b80554dea629dcf64bb1f65b65f4b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Dec 18 23:10:38 2013 +0100
Make the inifile broker backend the default backend.
-----------------------------------------------------------------------
Summary of changes:
README | 12 ++---
TODO | 6 ---
debian/changelog | 1 +
defaults/python-x2gobroker.default | 2 +-
doc/README.x2goclient+broker.getting-started | 57 +++++++++++++++++++++
doc/README.x2goclient+broker.zeroconf-backend | 66 -------------------------
etc/x2gobroker.conf | 4 +-
init/x2gobroker-daemon.init | 2 +-
man/man1/x2gobroker-testauth.1 | 2 +-
rpm/x2gobroker-daemon.init | 2 +-
x2gobroker/brokers/inifile_broker.py | 3 +-
x2gobroker/defaults.py | 7 ++-
12 files changed, 74 insertions(+), 90 deletions(-)
create mode 100644 doc/README.x2goclient+broker.getting-started
delete mode 100644 doc/README.x2goclient+broker.zeroconf-backend
The diff of changes is:
diff --git a/README b/README
index 71e43d0..a021cf5 100644
--- a/README
+++ b/README
@@ -8,7 +8,7 @@ Dependencies:
* This version of X2Go Session Broker requires X2Go Server
4.1.0.0 and above.
- * This version X2Go Session Broker works with X2Go Client
+ * This version of X2Go Session Broker works with X2Go Client
(>= 4.0.0.0) and Python X2Go (>= 0.5.0.0, not yet available)
as client.
* Python modules:
@@ -34,10 +34,10 @@ Available features:
Available backends:
- * ZEROCONF: the ,,zeroconf'' broker backend (which is the default)
- is for testing X2Go client applications without much hassle
- against the X2Go Session Broker
- * INIFILE: the ,,inifile'' broker backend scales well with
+ * ZEROCONF: the ,,zeroconf'' broker backend is for testing
+ X2Go client applications without much hassle against the
+ X2Go Session Broker
+ * INIFILE (default): the ,,inifile'' broker backend scales well with
small and medium X2Go deployments. It is configurable through
a single file (/etc/x2go/broker/x2gobroker-sessionprofiles.conf).
It provides flexible provisioning of session profiles based
@@ -58,7 +58,7 @@ Environment variables (and their defaults):
X2GOBROKER_DEBUG=false
# default X2Go Session Broker backend (available: zeroconf, inifile)
- X2GOBROKER_DEFAULT_BACKEND=zeroconf
+ X2GOBROKER_DEFAULT_BACKEND=inifile
# path to the X2Go Session Broker's configuration file
X2GOBROKER_CONFIG=/etc/x2go/x2gobroker.conf
diff --git a/TODO b/TODO
index dc1c5f9..930897c 100644
--- a/TODO
+++ b/TODO
@@ -11,18 +11,12 @@ Several more thinkable broker backends:
For the INIFILE backend:
- o implement load balancing
- o implement session resuing
o make use of X2Go::Server Perl API in x2gobroker-agent
- o add Apache2 CGI support
For the communication with Python X2Go:
o add a JSON based server/client protocol
-For the communication with LightDM (being a replacement of UCS):
-
- o add an XML based server/client protocol
light+love,
Mike Gabriel, 20130129
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index b5a7a69..9dd0ee7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -66,6 +66,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
- Fix man pages (layout issues on x2gobroker-authservice man page).
- Adapt man page installation to moval of x2gobroker(-testauth) from
an sbin to a bin directory (executable for any user).
+ - Make the inifile broker backend the default backend.
* debian/control:
+ Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
+ Fix SYNOPSIS texts.
diff --git a/defaults/python-x2gobroker.default b/defaults/python-x2gobroker.default
index 67b93cb..e9f0be5 100644
--- a/defaults/python-x2gobroker.default
+++ b/defaults/python-x2gobroker.default
@@ -23,7 +23,7 @@
#X2GOBROKER_DEBUG=0
# Default X2Go Session Broker backend (available: zeroconf, inifile)
-#X2GOBROKER_DEFAULT_BACKEND=zeroconf
+#X2GOBROKER_DEFAULT_BACKEND=inifile
# Path to the X2Go Session Broker's configuration file
#X2GOBROKER_CONFIG=/etc/x2go/x2gobroker.conf
diff --git a/doc/README.x2goclient+broker.getting-started b/doc/README.x2goclient+broker.getting-started
new file mode 100644
index 0000000..3457e04
--- /dev/null
+++ b/doc/README.x2goclient+broker.getting-started
@@ -0,0 +1,57 @@
+X2Go Client / X2Go Broker Setup
+===============================
+
+The easy setup for getting a first impression is this:
+
+
+1.
+Install x2goclient, x2gobroker and x2goserver(-xsession) locally
+
+ $ sudo apt-get install x2gobroker-daemon x2gobroker-authservice
+ $ sudo apt-get install x2goclient
+ $ sudo apt-get install x2goserver-xsession
+
+2.
+Edit the file /etc/default/x2gobroker-daemon. Enable the daemon and
+if needed, adapt the bind address:port (DAEMON_BIND_ADDRESS) parameter.
+
+After editing, save the file and return to your terminal command line.
+From here, start the daemon:
+
+ $ invoke-rc.d x2gobroker-daemon restart
+
+3.
+Launch x2goclient in HTTP broker mode:
+
+ $ x2goclient --broker-url=http://127.0.0.1:8080/plain/
+
+(if you have changed the bind address, use your changed value here).
+
+4.
+The first authentication that the x2goclient asks for is an authentication
+against the X2Go Broker (a HTTP server using the Tornado web framework on
+default port 8080).
+
+As authentication backend the PAM setup of your system is used, investigate this
+further by looking at this file:
+
+ $ sudo editor /etc/pam.d/x2gobroker
+
+5.
+If you authenticate with the broker successfully, then you get offered two
+session profiles named ,,KDE - localhost'' and ,,MATE - localhost''. These
+session profiles can be modified and customized in
+
+ /etc/x2go/broker/x2gobroker-sessionprofiles.conf
+
+6.
+If you select either of the session profiles (KDE or MATE on localhost), you
+will start an X2Go session on your local machine. (Of course, either KDE or the
+MATE desktop needs to be installed locally).
+
+
+
+
+
+
+
diff --git a/doc/README.x2goclient+broker.zeroconf-backend b/doc/README.x2goclient+broker.zeroconf-backend
deleted file mode 100644
index c72d8b8..0000000
--- a/doc/README.x2goclient+broker.zeroconf-backend
+++ /dev/null
@@ -1,66 +0,0 @@
-X2Go Client / X2Go Broker Setup
-===============================
-
-The easy setup for getting a first impression is this:
-
-
-1.
-Install x2goclient, x2gobroker and x2goserver(-xsession) locally
-
- $ sudo apt-get install x2gobroker-daemon
- $ sudo apt-get install x2goclient
- $ sudo apt-get install x2goserver-xsession
-
-2.
-Then edit /etc/x2go/x2gobroker.conf. The configuration file falls
-into a [global] section and several [backend] sections.
-
-The default backend section is the [zeroconf] backend. Find that
-section in the configuration file.
-
-Edit the 'desktop-shell' in section [zeroconf], the default is KDE.
-If KDE is not installed locally, choose either of LXDE, XFCE, etc.
-
-Save the file again after editing.
-
-3.
-Edit the file /etc/default/x2gobroker-daemon. Enable the daemon and
-if needed, adapt the bind address:port (DAEMON_BIND_ADDRESS) parameter.
-
-After editing, save the file and return to your terminal command line.
-From here, start the daemon:
-
- $ invoke-rc.d x2gobroker-daemon start
-
-4.
-Launch x2goclient in HTTP broker mode:
-
- $ x2goclient --broker-url=http://127.0.0.1:8080/plain/zeroconf/
-
-(if you have changed the bind address, use your changed value here).
-
-5.
-The first authentication that the x2goclient asks for is an authentication
-against the x2gobroker (a HTTP server using the web.py framework on port 8080).
-
-As authentication backend the PAM setup of your system is used, investigate this
-further by looking at this file:
-
- $ sudo editor /etc/pam.d/x2gobroker
-
-6.
-If you authenticate with the broker successfully, then you get offered one
-session profile named ,,LOCALHOST''. This session profile is hard-coded into
-the zeroconf backend of the X2Go Session Broker. The zeroconf backend is
-for testing client functionality only and it is very minimal.
-
-7.
-If you select the session profile LOCALHOST, you will start an X2Go session
-on your local machine.
-
-
-
-
-
-
-
diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf
index 61e0b92..342ff50 100644
--- a/etc/x2gobroker.conf
+++ b/etc/x2gobroker.conf
@@ -195,14 +195,14 @@
# For small-scale deployments the IniFile backend is the recommended backend.
[zeroconf]
-#enable = true
+#enable = false
#auth-mech = pam
#user-db = libnss
#group-db = libnss
#desktop-shell = KDE
[inifile]
-#enable = false
+#enable = true
#session-profiles = /etc/x2go/broker/x2gobroker-sessionprofiles.conf
#[ldap] -> MUSIC OF THE FUTURE
diff --git a/init/x2gobroker-daemon.init b/init/x2gobroker-daemon.init
index 932c3a8..444673b 100755
--- a/init/x2gobroker-daemon.init
+++ b/init/x2gobroker-daemon.init
@@ -31,7 +31,7 @@ DAEMON_BIND_ADDRESS=127.0.0.1:8080
X2GOBROKER_DEBUG=0
X2GOBROKER_DAEMON_USER='x2gobroker'
X2GOBROKER_DAEMON_GROUP='x2gobroker'
-X2GOBROKER_DEFAULT_BACKEND="zeroconf"
+X2GOBROKER_DEFAULT_BACKEND="inifile"
X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf"
X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf"
X2GOBROKER_AGENT_CMD="/usr/lib/x2go/x2gobroker-agent"
diff --git a/man/man1/x2gobroker-testauth.1 b/man/man1/x2gobroker-testauth.1
index b9f41a2..1474106 100644
--- a/man/man1/x2gobroker-testauth.1
+++ b/man/man1/x2gobroker-testauth.1
@@ -49,7 +49,7 @@ Enable debugging code.
Specify an alternative configuration file name, default is: \fI/etc/x2go/x2gobroker.conf\fR.
.TP
\*(T<\fB\-b, \-\-backend BACKEND\fR\*(T>
-Specify another configured/enabled backend configuration to test authentication against, default is: the \fIzeroconf\fR backend.
+Specify another configured/enabled backend configuration to test authentication against, default is: the \fIinifile\fR backend.
.SH "FILES"
/etc/x2go/x2gobroker.conf, /etc/x2go/broker/* (configuration files)
.PP
diff --git a/rpm/x2gobroker-daemon.init b/rpm/x2gobroker-daemon.init
index a6e2b48..38072ec 100644
--- a/rpm/x2gobroker-daemon.init
+++ b/rpm/x2gobroker-daemon.init
@@ -30,7 +30,7 @@ DAEMON_BIND_ADDRESS=127.0.0.1:8080
X2GOBROKER_DEBUG=0
X2GOBROKER_DAEMON_USER='x2gobroker'
X2GOBROKER_DAEMON_GROUP='x2gobroker'
-X2GOBROKER_DEFAULT_BACKEND="zeroconf"
+X2GOBROKER_DEFAULT_BACKEND="inifile"
X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf"
X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf"
X2GOBROKER_AGENT_CMD="/usr/lib/x2go/x2gobroker-agent"
diff --git a/x2gobroker/brokers/inifile_broker.py b/x2gobroker/brokers/inifile_broker.py
index e8113e6..735d3fc 100644
--- a/x2gobroker/brokers/inifile_broker.py
+++ b/x2gobroker/brokers/inifile_broker.py
@@ -19,8 +19,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-L{inifile.X2GoBroker} class - a simple X2GoBroker implementations that uses text-based config files only
-and does not support load balancing.
+L{inifile.X2GoBroker} class - a simple X2GoBroker implementations that uses text-based config files (also supports load balancing)
"""
__NAME__ = 'x2gobroker-pylib'
diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py
index 2d069d3..9087027 100644
--- a/x2gobroker/defaults.py
+++ b/x2gobroker/defaults.py
@@ -89,7 +89,7 @@ else:
if os.environ.has_key('X2GOBROKER_DEFAULT_BACKEND'):
X2GOBROKER_DEFAULT_BACKEND = os.environ['X2GOBROKER_DEFAULT_BACKEND']
else:
- X2GOBROKER_DEFAULT_BACKEND = "zeroconf"
+ X2GOBROKER_DEFAULT_BACKEND = "inifile"
if os.environ.has_key('X2GOBROKER_SSL_CERTFILE'):
X2GOBROKER_SSL_CERTFILE = os.environ['X2GOBROKER_SSL_CERTFILE']
@@ -116,7 +116,6 @@ X2GOBROKER_HOME = os.path.normpath(os.path.expanduser('~{broker_uid}'.format(bro
# defaults for X2Go Sessino Broker configuration file
X2GOBROKER_CONFIG_DEFAULTS = {
'global': {
- u'backend': u'zeroconf',
u'check-credentials': True,
u'require-cookie-auth': False,
u'use-static-cookie': True,
@@ -135,14 +134,14 @@ X2GOBROKER_CONFIG_DEFAULTS = {
u'default-agent-query-mode': u'NONE',
},
'zeroconf': {
- u'enable': True,
+ u'enable': False,
u'auth-mech': u'pam',
u'user-db': u'libnss',
u'group-db': u'libnss',
u'desktop-shell': u'KDE',
},
'inifile': {
- u'enable': False,
+ u'enable': True,
u'session-profiles': u'/etc/x2go/broker/x2gobroker-sessionprofiles.conf',
u'auth-mech': u'',
u'user-db': u'',
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