This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 24e0e141e6610a1f210f5b7c03b3d46d3aeea2c8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Apr 2 23:57:31 2015 +0200 white-space cleanup --- Makefile | 6 +++--- debian/changelog | 2 +- debian/x2gobroker-ssh.templates | 2 +- man/man1/x2gobroker.1 | 2 +- man/man8/x2gobroker-loadchecker.8 | 2 +- sbin/x2gobroker-authservice | 2 +- sbin/x2gobroker-loadchecker | 2 +- sbin/x2gobroker-testagent | 2 +- x2gobroker/web/uccs.py | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 98e0be9..ecb7639 100755 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ install: "${DESTDIR}${MANDIR}/man8" ${INSTALL_PROGRAM} lib/x2gobroker-agent* "${DESTDIR}${LIBDIR}/" ${INSTALL_PROGRAM} sbin/x2gobroker-pubkeyauthorizer "${DESTDIR}${SBINDIR}/" - + # x2gobroker-authservice mkdir -p "${DESTDIR}${SBINDIR}" "${DESTDIR}/etc/logrotate.d" \ "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/default" \ @@ -110,7 +110,7 @@ install: "${DESTDIR}/etc/logrotate.d/" ${INSTALL_FILE} etc/broker/x2gobroker-authservice-logger.conf \ "${DESTDIR}${ETCDIR}/broker/" - + # x2gobroker-loadchecker mkdir -p "${DESTDIR}${SBINDIR}" "${DESTDIR}/etc/logrotate.d" \ "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/default" \ @@ -159,7 +159,7 @@ install: ${INSTALL_FILE} etc/x2gobroker-wsgi.apache.{conf,vhost} \ "${DESTDIR}${ETCDIR}/" ${INSTALL_FILE} logrotate/x2gobroker-wsgi "${DESTDIR}/etc/logrotate.d/" - + # x2gobroker mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}" \ "${DESTDIR}${MANDIR}/man1" diff --git a/debian/changelog b/debian/changelog index 5df4393..fed1748 100644 --- a/debian/changelog +++ b/debian/changelog @@ -304,7 +304,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low further possible substitutions for deriving the full path of the authorized_keys file where X2Go Broker Agent's deploys public SSH user keys to. (Fixes: #665). - - agent.py: Use os.fork() instead of threading.Thread() to handle + - agent.py: Use os.fork() instead of threading.Thread() to handle delayed executions of broker agent tasks. This assures that SSH pub keys are removed via the delauthkey broker agent task, if the SSH broker is used. (Fixes: #491). diff --git a/debian/x2gobroker-ssh.templates b/debian/x2gobroker-ssh.templates index 7686259..a906dbe 100644 --- a/debian/x2gobroker-ssh.templates +++ b/debian/x2gobroker-ssh.templates @@ -1,6 +1,6 @@ Template: x2gobroker-ssh/last-group-x2gobroker-users Type: string -Default: +Default: Description: for internal use Template: x2gobroker-ssh/create-group diff --git a/man/man1/x2gobroker.1 b/man/man1/x2gobroker.1 index 4f00a48..ed6e57b 100644 --- a/man/man1/x2gobroker.1 +++ b/man/man1/x2gobroker.1 @@ -78,7 +78,7 @@ is allowed to change its user context and do queries on behalf of the user speci .TP \*(T<\fB\-\-auth-cookie, \-\-auth-id AUTHENTICATION_COOKIE\fR\*(T> It is possible to enforce a stronger authentication via an additional pre\-shared authentication cookie. This authentication -cookie must be stored in a client-side file so that X2Go Client can access it and then pass it on to the X2Go +cookie must be stored in a client-side file so that X2Go Client can access it and then pass it on to the X2Go Session Broker (via the X2Go Client option \-\-auth-id=<fullpath-to-file>) while authenticating against the broker. The server-side cookie hash can be set in \fI/etc/x2go/x2gobroker.conf\fR (option: my-cookie). You have to set diff --git a/man/man8/x2gobroker-loadchecker.8 b/man/man8/x2gobroker-loadchecker.8 index f025f5e..5706724 100644 --- a/man/man8/x2gobroker-loadchecker.8 +++ b/man/man8/x2gobroker-loadchecker.8 @@ -22,7 +22,7 @@ x2gobroker-loadchecker \- Load checker service for X2Go Session Broker .ad b 'hy .SH DESCRIPTION -\fBx2gobroker-loadchecker\fR is a service that collects system load metrics from +\fBx2gobroker-loadchecker\fR is a service that collects system load metrics from broker-associated X2Go Servers. .PP When load-balancing shall be used, the simplest way to detect "server load" diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice index c1101cd..be6ea4b 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -173,7 +173,7 @@ if __name__ == '__main__': {'args':['-p','--permissions'], 'default': '0660', 'help': 'set these file permissions for the AuthService socket file', }, {'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code', }, {'args':['-i','--debug-interactively'], 'default': False, 'action': 'store_true', 'help': 'force output of log message to the stderr (rather than to the log files)', }, - + ] if CAN_DAEMONIZE: common_options.extend([ diff --git a/sbin/x2gobroker-loadchecker b/sbin/x2gobroker-loadchecker index bdc88f6..aac8798 100755 --- a/sbin/x2gobroker-loadchecker +++ b/sbin/x2gobroker-loadchecker @@ -195,7 +195,7 @@ if __name__ == '__main__': {'args':['-p','--permissions'], 'default': '0660', 'help': 'set these file permissions for the LoadChecker socket file', }, {'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code', }, {'args':['-i','--debug-interactively'], 'default': False, 'action': 'store_true', 'help': 'force output of log message to the stderr (rather than to the log files)', }, - + ] if CAN_DAEMONIZE: common_options.extend([ diff --git a/sbin/x2gobroker-testagent b/sbin/x2gobroker-testagent index 24623f6..752b2c3 100755 --- a/sbin/x2gobroker-testagent +++ b/sbin/x2gobroker-testagent @@ -119,7 +119,7 @@ if __name__ == "__main__": list_tasks = cmdline_args.list_tasks -local_agent = (hostname == 'LOCAL') +local_agent = (hostname == 'LOCAL') query_mode = local_agent and 'LOCAL' or 'SSH' if local_agent: remote_agent = None else: remote_agent = {'hostname': hostname, 'port': port, } diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py index 92686f8..1b228c5 100644 --- a/x2gobroker/web/uccs.py +++ b/x2gobroker/web/uccs.py @@ -38,7 +38,7 @@ def credentials_validate(username, password): broker = x2gobroker.brokers.base_broker.X2GoBroker() broker.enable() access, next_cookie = broker.check_access(username=username, password=password) - # UCCS only allows email addresses for remote login + # UCCS only allows email addresses for remote login if not access and "@" in username: username = username.split('@')[0] access, next_cookie = broker.check_access(username=username, password=password) -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git