This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit a477c57081caf242bbf6cb4c8bca17eb273743c8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 12 00:23:06 2014 +0200 Update README and TODO. --- README | 23 +++++++++++++++++++---- TODO | 6 +----- debian/changelog | 1 + doc/README.x2goclient+broker.getting-started | 4 ++-- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/README b/README index a021cf5..2c2b709 100644 --- a/README +++ b/README @@ -7,10 +7,10 @@ session brokerage for X2Go via HTTP(S) and/or SSH. Dependencies: * This version of X2Go Session Broker requires X2Go Server - 4.1.0.0 and above. + 4.0.1.16 and above. * 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. + (>= 4.0.0.0) and Python X2Go (>= 0.5.0.0) + as a client. * Python modules: - python-setuptools (build-dependency) - python-argparse @@ -43,6 +43,21 @@ Available backends: It provides flexible provisioning of session profiles based on user, group and host ACLs. +Available authentication mechanisms: + + * NONE: Always authenticate every user never mind if password + is correct or not. + * PAM: Authenticate against the local PAM setup. The service + file /etc/pam.d/x2gobroker can be used to configure the + authentication. + * HTTPS_GET: Perform a http GET request against a web server. + If the web server returned code 200, authentication is + considered a success. + +Available nameservice backends: + + * LIBNSS: Obtain uses from the broker host's libnss configuration. + Configuration files: /etc/default/{x2gobroker-daemon,python-x2gobroker,x2gobroker-authservice} @@ -73,5 +88,5 @@ Environment variables (and their defaults): X2GOBROKER_AUTHSERVICE_SOCKET=/run/x2gobroker/x2gobroker-authservice.socket light+love, -Mike Gabriel, 20130818 +Mike Gabriel, 20140912 diff --git a/TODO b/TODO index 930897c..fc3b525 100644 --- a/TODO +++ b/TODO @@ -13,10 +13,6 @@ For the INIFILE backend: o make use of X2Go::Server Perl API in x2gobroker-agent -For the communication with Python X2Go: - - o add a JSON based server/client protocol - light+love, -Mike Gabriel, 20130129 \ No newline at end of file +Mike Gabriel, 20140912 diff --git a/debian/changelog b/debian/changelog index cfe0cf4..87cfaaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -157,6 +157,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low instances or hosts behind a reverse NATed IPv4 gateway). This ended up in a rewrite of the complete selection_session() method of the base broker code. + - Update README and TODO. * debian/control: + Provide separate bin:package for SSH brokerage: x2gobroker-ssh. + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/doc/README.x2goclient+broker.getting-started b/doc/README.x2goclient+broker.getting-started index 3457e04..f5b471f 100644 --- a/doc/README.x2goclient+broker.getting-started +++ b/doc/README.x2goclient+broker.getting-started @@ -38,8 +38,8 @@ 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 +If you have successfully authenticated against the broker, 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 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git