This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from 5c6e7c2 Set default log level to "WARNING", not "DEBUG". new 72396c4 defaults/x2gobroker-logchecker.default: Fix copy+paste errors. new a772a32 doc/README.x2goclient+broker.getting-started: Mention how to launch PyHoca-GUI in broker mode. new 6f5eaba etc/broker/defaults.conf: Fix copy+paste errors. new ddbc2e3 etc/x2gobroker-wsgi.*.conf: Make host ACLs Apache2.4 compliant. new 72c1721 etc/x2gobroker.conf: Minor comment modification. new 0c6c676 logrotate/x2gobroker-loadchecker: The loadchecker.log file needs to be owned by user x2gobroker. new 9430717 rpm/x2gobroker-*.init: Fix copy+paste errors. new d33387d man pages: Update date. new a63c1ac update changelog The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 8 ++++++++ defaults/x2gobroker-loadchecker.default | 15 +++++++-------- doc/README.x2goclient+broker.getting-started | 16 ++++++++-------- etc/broker/defaults.conf | 23 +++++++++++++++++++---- etc/x2gobroker-wsgi.apache.conf | 16 +++++++++++----- etc/x2gobroker-wsgi.apache.vhost | 16 +++++++++++----- etc/x2gobroker.conf | 2 +- logrotate/x2gobroker-loadchecker | 2 +- man/man1/x2gobroker.1 | 2 +- man/man8/x2gobroker-authservice.8 | 2 +- man/man8/x2gobroker-daemon-debug.8 | 2 +- man/man8/x2gobroker-keygen.8 | 2 +- man/man8/x2gobroker-pubkeyauthorizer.8 | 2 +- rpm/x2gobroker-authservice.init | 2 +- rpm/x2gobroker-daemon.init | 2 +- rpm/x2gobroker-loadchecker.init | 2 +- 16 files changed, 74 insertions(+), 40 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 72396c432c940e0dd8fce451fb11aca808654771 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 30 16:03:27 2015 +0200 defaults/x2gobroker-logchecker.default: Fix copy+paste errors. --- defaults/x2gobroker-loadchecker.default | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/defaults/x2gobroker-loadchecker.default b/defaults/x2gobroker-loadchecker.default index b5bcd3e..ad1027d 100644 --- a/defaults/x2gobroker-loadchecker.default +++ b/defaults/x2gobroker-loadchecker.default @@ -1,20 +1,19 @@ # X2Go Session Broker (Load Checker Service) configuration # SystemV-like init systems -# For PAM authentication the X2Go Session Broker needs its authentication -# service. The session broker itself runs as a non-privileged user (see below) -# whereas the authentication service must run as super-user root. -# -# If you do not use PAM as authentication mechanism with the X2Go Session Broker, -# you can disable the authentication service here. +# The X2Go Session Broker ships a daemon that checks X2Go Server +# system metrics in the background. If you want to use this daemon, +# enable it here and adapt x2gobroker.conf. +# NOTE: The load checker service only makes sense with broker setups +# that mediate X2Go load-balancing. START_LOADCHECKER=false -# Control debug mode (0=disable, 1=enable) of the X2Go Broker Authentication +# Control debug mode (0=disable, 1=enable) of the X2Go Broker Load Checker # Service. # # Logging is (by default) written to /var/log/x2gobroker/*log. # # This option can also be configured in /etc/default/python-x2go. # The value configured here overrides the value from python-x2go -# defaults and only sets the x2gobroker-authservice into debug mode. +# defaults and only sets the x2gobroker-loadchecker into debug mode. #X2GOBROKER_DEBUG=0 -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit a772a32eefcacf0c2e1643486d2f93e02d20266f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 30 16:03:50 2015 +0200 doc/README.x2goclient+broker.getting-started: Mention how to launch PyHoca-GUI in broker mode. --- doc/README.x2goclient+broker.getting-started | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/README.x2goclient+broker.getting-started b/doc/README.x2goclient+broker.getting-started index f5b471f..bececee 100644 --- a/doc/README.x2goclient+broker.getting-started +++ b/doc/README.x2goclient+broker.getting-started @@ -20,13 +20,20 @@ From here, start the daemon: $ invoke-rc.d x2gobroker-daemon restart -3. +3.1 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). +3.2 +Alternatively, launch pyhoca-gui in HTTP broker mode: + + $ pyhoca-gui --broker-url=https://127.0.0.1:8080/json/ + +(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 @@ -48,10 +55,3 @@ session profiles can be modified and customized in 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). - - - - - - - -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 6f5eabaf7b876c7719136df9bcfe3e9700633f20 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 30 16:04:26 2015 +0200 etc/broker/defaults.conf: Fix copy+paste errors. --- etc/broker/defaults.conf | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/etc/broker/defaults.conf b/etc/broker/defaults.conf index 38dfc2d..79020db 100644 --- a/etc/broker/defaults.conf +++ b/etc/broker/defaults.conf @@ -1,5 +1,6 @@ [common] -# X2Go Broker Session Broker (common) configuration for Debian +# X2Go Broker Session Broker (common) configuration for hosts using +# systemd # The posix user/group ID the broker runs under (do not change!) # if you change those nonetheless, make sure that the log file @@ -35,11 +36,11 @@ # The unix socket file for communication between the broker and the authentication service. #X2GOBROKER_AUTHSERVICE_SOCKET=/run/x2gobroker/x2gobroker-authservice.socket -# The unix socket file for communication between the broker and the authentication service. +# The unix socket file for communication between the broker and the load checker service. #X2GOBROKER_LOADCHECKER_SOCKET=/run/x2gobroker/x2gobroker-loadchecker.socket [daemon] -# X2Go Session Broker configuration for Debian +# X2Go Session Broker configuration for hosts using systemd # Bind standalone daemon to this address:port #DAEMON_BIND_ADDRESS=127.0.0.1:8080 @@ -65,7 +66,8 @@ #X2GOBROKER_SSL_KEYFILE=/etc/x2go/broker/ssl/broker.key [authservice] -# X2Go Session Broker (PAM Authentication Service) configuration for Debian +# X2Go Session Broker (PAM Authentication Service) configuration for +# hosts using systemd. # # currently nothing to configure for the authentication service... @@ -75,3 +77,16 @@ # Enabling debug mode here does not affect other parts of the # X2Go Session Broker. #X2GOBROKER_DEBUG=0 + +[loadchecker] +# X2Go Session Broker (Load Checker Service) configuration for +# hosts using systemd +# +# currently nothing to configure for the load checker service... + +# Control debug mode (0=disable, 1=enable). +# +# Produce verbose log output in the load checker's log file only. +# Enabling debug mode here does not affect other parts of the +# X2Go Session Broker. +#X2GOBROKER_DEBUG=0 -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit ddbc2e3f0fcc041485cfcc9c31ad12996737aeb6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 30 16:05:19 2015 +0200 etc/x2gobroker-wsgi.*.conf: Make host ACLs Apache2.4 compliant. --- etc/x2gobroker-wsgi.apache.conf | 16 +++++++++++----- etc/x2gobroker-wsgi.apache.vhost | 16 +++++++++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/etc/x2gobroker-wsgi.apache.conf b/etc/x2gobroker-wsgi.apache.conf index cb85385..80316f4 100644 --- a/etc/x2gobroker-wsgi.apache.conf +++ b/etc/x2gobroker-wsgi.apache.conf @@ -32,12 +32,18 @@ WSGIScriptAlias /x2gobroker /usr/bin/x2gobroker WSGIProcessGroup x2gobroker <Directory /usr/bin/x2gobroker> - Order deny,allow - Deny from all - # grant explicit access below - Allow from 127.0.0.1 - Allow from ::1 + <IfModule mod_authz_core.c> + # Apache 2.4 + Require local + </IfModule> + <IfModule !mod_authz_core.c> + # Apache 2.2 + Order Deny,Allow + Deny from all + Allow from 127.0.0.1 + Allow from ::1 + </IfModule> Options +FollowSymLinks Options -Indexes diff --git a/etc/x2gobroker-wsgi.apache.vhost b/etc/x2gobroker-wsgi.apache.vhost index 4cc7a2a..6852830 100644 --- a/etc/x2gobroker-wsgi.apache.vhost +++ b/etc/x2gobroker-wsgi.apache.vhost @@ -46,12 +46,18 @@ WSGIProcessGroup x2gobroker <Directory /usr/bin/x2gobroker> - Order deny,allow - Deny from all - # grant explicit access below - Allow from 127.0.0.1 - Allow from ::1 + <IfModule mod_authz_core.c> + # Apache 2.4 + Require local + </IfModule> + <IfModule !mod_authz_core.c> + # Apache 2.2 + Order Deny,Allow + Deny from all + Allow from 127.0.0.1 + Allow from ::1 + </IfModule> Options +FollowSymLinks Options -Indexes -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 72c1721106887ade024491eb1d54800b1ff4cdfb Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 30 16:05:49 2015 +0200 etc/x2gobroker.conf: Minor comment modification. --- etc/x2gobroker.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index 8d57ae1..86314f4 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -288,7 +288,7 @@ #default-use-load-checker = false # If the x2gobroker-loadchecker daemon gets used, define here how -# many seconds to sleep between querying system load from the +# many seconds to sleep between cycles of querying system load from the # associated X2Go Servers. # #load-checker-intervals = 300 -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 0c6c6766d4e3c9c73aef48e390ea864ba48ea7af Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 30 16:06:24 2015 +0200 logrotate/x2gobroker-loadchecker: The loadchecker.log file needs to be owned by user x2gobroker. --- logrotate/x2gobroker-loadchecker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logrotate/x2gobroker-loadchecker b/logrotate/x2gobroker-loadchecker index e5c8c65..672f9ba 100644 --- a/logrotate/x2gobroker-loadchecker +++ b/logrotate/x2gobroker-loadchecker @@ -5,7 +5,7 @@ compress delaycompress notifempty - create 640 root adm + create 640 x2gobroker adm su root adm sharedscripts postrotate -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 94307176d87084eab4919835659e973e8bad5bf1 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 30 16:06:52 2015 +0200 rpm/x2gobroker-*.init: Fix copy+paste errors. --- rpm/x2gobroker-authservice.init | 2 +- rpm/x2gobroker-daemon.init | 2 +- rpm/x2gobroker-loadchecker.init | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rpm/x2gobroker-authservice.init b/rpm/x2gobroker-authservice.init index 750536a..c6be1c5 100755 --- a/rpm/x2gobroker-authservice.init +++ b/rpm/x2gobroker-authservice.init @@ -3,7 +3,7 @@ # x2gobroker-authservice - Starts/stop the "x2gobroker-authservice" daemon # # chkconfig: 2345 99 1 -# description: Cleans the X2Go session database +# description: X2Go Session Broker's (PAM) Authentication Service ### BEGIN INIT INFO # Provides: x2gobroker-authservice diff --git a/rpm/x2gobroker-daemon.init b/rpm/x2gobroker-daemon.init index c0e7870..0dbda98 100755 --- a/rpm/x2gobroker-daemon.init +++ b/rpm/x2gobroker-daemon.init @@ -3,7 +3,7 @@ # x2gobroker-daemon - Starts/stop the "x2gobroker-daemon" daemon # # chkconfig: 2345 99 1 -# description: Cleans the X2Go session database +# description: X2Go Session Broker Standalone Daemon ### BEGIN INIT INFO # Provides: x2gobroker-daemon diff --git a/rpm/x2gobroker-loadchecker.init b/rpm/x2gobroker-loadchecker.init index bc4891c..2fb7928 100755 --- a/rpm/x2gobroker-loadchecker.init +++ b/rpm/x2gobroker-loadchecker.init @@ -3,7 +3,7 @@ # x2gobroker-loadchecker - Starts/stop the "x2gobroker-loadchecker" daemon # # chkconfig: 2345 99 1 -# description: Cleans the X2Go session database +# description: X2Go Session Broker's Load Checker Service ### BEGIN INIT INFO # Provides: x2gobroker-loadchecker -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit d33387da8324b7de0ca06e39c6f07e93aaf3d87a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 30 16:07:05 2015 +0200 man pages: Update date. --- man/man1/x2gobroker.1 | 2 +- man/man8/x2gobroker-authservice.8 | 2 +- man/man8/x2gobroker-daemon-debug.8 | 2 +- man/man8/x2gobroker-keygen.8 | 2 +- man/man8/x2gobroker-pubkeyauthorizer.8 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/man/man1/x2gobroker.1 b/man/man1/x2gobroker.1 index 4295926..cadb4e1 100644 --- a/man/man1/x2gobroker.1 +++ b/man/man1/x2gobroker.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobroker 1 "Feb 2014" "Version 0.0.3.x" "X2Go Session Broker" +.TH x2gobroker 1 "Mar 2015" "Version 0.0.3.x" "X2Go Session Broker" .SH NAME x2gobroker{,-daemon,-ssh} \- Session Broker for X2Go .SH SYNOPSIS diff --git a/man/man8/x2gobroker-authservice.8 b/man/man8/x2gobroker-authservice.8 index 8981ee6..af11dbb 100644 --- a/man/man8/x2gobroker-authservice.8 +++ b/man/man8/x2gobroker-authservice.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobroker-authservice 8 "Feb 2014" "Version 0.0.3.x" "X2Go Session Broker" +.TH x2gobroker-authservice 8 "Mar 2015" "Version 0.0.3.x" "X2Go Session Broker" .SH NAME x2gobroker-authservice \- PAM authentication service for X2Go Session Broker .SH SYNOPSIS diff --git a/man/man8/x2gobroker-daemon-debug.8 b/man/man8/x2gobroker-daemon-debug.8 index 4f654ec..01c2a59 100644 --- a/man/man8/x2gobroker-daemon-debug.8 +++ b/man/man8/x2gobroker-daemon-debug.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobroker-daemon-debug 8 "Feb 2014" "Version 0.0.3.x" "X2Go Session Broker" +.TH x2gobroker-daemon-debug 8 "Mar 2015" "Version 0.0.3.x" "X2Go Session Broker" .SH NAME x2gobroker-daemon-debug \- Debug X2Go Session Broker's Standalone Daemon .SH SYNOPSIS diff --git a/man/man8/x2gobroker-keygen.8 b/man/man8/x2gobroker-keygen.8 index 0ce7be5..c8849d6 100644 --- a/man/man8/x2gobroker-keygen.8 +++ b/man/man8/x2gobroker-keygen.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobroker-keygen 8 "Feb 2014" "Version 0.0.3.x" "X2Go Session Broker" +.TH x2gobroker-keygen 8 "Mar 2015" "Version 0.0.3.x" "X2Go Session Broker" .SH NAME x2gobroker-keygen \- Generate SSH keys for X2Go Session Broker .SH SYNOPSIS diff --git a/man/man8/x2gobroker-pubkeyauthorizer.8 b/man/man8/x2gobroker-pubkeyauthorizer.8 index 8d9ee9c..fc2e5d8 100644 --- a/man/man8/x2gobroker-pubkeyauthorizer.8 +++ b/man/man8/x2gobroker-pubkeyauthorizer.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobroker-pubkeyauthorizer 8 "Feb 2014" "Version 0.0.3.x" "X2Go Session Broker" +.TH x2gobroker-pubkeyauthorizer 8 "Mar 2015" "Version 0.0.3.x" "X2Go Session Broker" .SH NAME x2gobroker-pubkeyauthorizer \- Retrieve public SSH keys from an X2Go Session Broker .SH SYNOPSIS -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit a63c1ac9a3d6408b11dcec29ce80e1175288af43 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 30 16:08:07 2015 +0200 update changelog --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3fee935..998b8f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -272,6 +272,13 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Fix detection of running x2gobroker-daemon process in Debian's SystemV init script. - Set default log level to "WARNING", not "DEBUG". + - defaults/x2gobroker-logchecker.default: Fix copy+paste errors. + - doc/README.x2goclient+broker.getting-started: Mention how to launch PyHoca-GUI in broker mode. + - etc/broker/defaults.conf: Fix copy+paste errors. + - etc/x2gobroker-wsgi.*.conf: Make host ACLs Apache2.4 compliant. + - logrotate/x2gobroker-loadchecker: The loadchecker.log file needs to be owned by user x2gobroker. + - rpm/x2gobroker-*.init: Fix copy+paste errors. + - man pages: Update date. * debian/control: + Provide separate bin:package for SSH brokerage: x2gobroker-ssh. + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. @@ -357,6 +364,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low * x2gobroker.spec: + Change all python-pampy references to python-pam on non-SUSE systems. + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 07 Jun 2013 23:25:30 +0200 x2gobroker (0.0.2.3-0~x2go1) unstable; urgency=low -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
-
git-admin＠x2go.org