The branch, master has been updated via 94002645899cdc22cf30dec255b04a24c30db692 (commit) from 476605f12aee58e407dba0f28e76e879b775e76a (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 94002645899cdc22cf30dec255b04a24c30db692 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Aug 18 20:37:13 2013 +0200 Move x2gobroker executable to /usr/bin. ----------------------------------------------------------------------- Summary of changes: Makefile | 42 ++++++++++---------- NEWS | 36 +++++++++++++---- {sbin => bin}/x2gobroker | 10 ++++- debian/changelog | 1 + debian/x2gobroker-wsgi.links | 2 +- debian/x2gobroker.install | 2 +- debian/x2gobroker.manpages | 4 +- etc/x2gobroker-wsgi.apache.conf | 4 +- etc/x2gobroker-wsgi.apache.vhost | 4 +- init/x2gobroker-daemon.init | 4 +- .../x2gobroker-testauth.1} | 2 +- man/{man8/x2gobroker.8 => man1/x2gobroker.1} | 2 +- man/man8/x2gobroker-authservice.8 | 2 +- man/man8/x2gobroker-keygen.8 | 2 +- man/man8/x2gobroker-pubkeyauthorizer.8 | 2 +- 15 files changed, 75 insertions(+), 44 deletions(-) rename {sbin => bin}/x2gobroker (96%) rename man/{man8/x2gobroker-testauth.8 => man1/x2gobroker-testauth.1} (96%) rename man/{man8/x2gobroker.8 => man1/x2gobroker.1} (96%) The diff of changes is: diff --git a/Makefile b/Makefile index cb6a1b8..ee09c35 100755 --- a/Makefile +++ b/Makefile @@ -73,61 +73,61 @@ test: install: mkdir -p "${DESTDIR}/var/lib/x2gobroker" \ - "${DESTDIR}/var/log/x2gobroker" + "${DESTDIR}/var/log/x2gobroker" # python-x2gobroker python setup.py install --prefix="${PREFIX}" $${DESTDIR+--root="${DESTDIR}"} mkdir -p "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/pam.d" \ - "${DESTDIR}/etc/default" + "${DESTDIR}/etc/default" ${INSTALL_FILE} defaults/python-x2gobroker.default \ - "${DESTDIR}/etc/default/python-x2gobroker" + "${DESTDIR}/etc/default/python-x2gobroker" ${INSTALL_FILE} etc/x2gobroker.conf "${DESTDIR}${ETCDIR}/" ${INSTALL_FILE} etc/broker/x2gobroker-sessionprofiles.conf \ - etc/broker/x2gobroker-loggers.conf \ - "${DESTDIR}${ETCDIR}/broker/" + etc/broker/x2gobroker-loggers.conf \ + "${DESTDIR}${ETCDIR}/broker/" mkdir -p "${DESTDIR}/etc/pam.d" ${INSTALL_FILE} pam/x2gobroker "${DESTDIR}/etc/pam.d/" # x2gobroker-agent mkdir -p "${DESTDIR}${LIBDIR}" "${DESTDIR}${SBINDIR}" \ - "${DESTDIR}${MANDIR}/man8" + "${DESTDIR}${MANDIR}/man8" ${INSTALL_FILE} man/man8/x2gobroker-pubkeyauthorizer.8* \ - "${DESTDIR}${MANDIR}/man8" + "${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" \ - "${DESTDIR}${MANDIR}/man8" + "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/default" \ + "${DESTDIR}${MANDIR}/man8" ${INSTALL_FILE} defaults/x2gobroker-authservice.default \ - "${DESTDIR}/etc/default/x2gobroker-authservice" + "${DESTDIR}/etc/default/x2gobroker-authservice" ${INSTALL_FILE} man/man8/x2gobroker-authservice.8* \ - "${DESTDIR}${MANDIR}/man8" + "${DESTDIR}${MANDIR}/man8" ${INSTALL_PROGRAM} sbin/x2gobroker-authservice "${DESTDIR}${SBINDIR}/" ${INSTALL_FILE} logrotate/x2gobroker-authservice \ - "${DESTDIR}/etc/logrotate.d/" + "${DESTDIR}/etc/logrotate.d/" ${INSTALL_FILE} etc/broker/x2gobroker-authservice-logger.conf \ - "${DESTDIR}${ETCDIR}/broker/" + "${DESTDIR}${ETCDIR}/broker/" # x2gobroker-daemon mkdir -p "${DESTDIR}/etc/logrotate.d/" "${DESTDIR}/etc/default" ${INSTALL_FILE} defaults/x2gobroker-daemon.default \ - "${DESTDIR}/etc/default/x2gobroker-daemon" + "${DESTDIR}/etc/default/x2gobroker-daemon" ${INSTALL_FILE} logrotate/x2gobroker-daemon \ - "${DESTDIR}/etc/logrotate.d/" + "${DESTDIR}/etc/logrotate.d/" # x2gobroker-wsgi mkdir -p "${DESTDIR}${ETCDIR}" "${DESTDIR}/etc/logrotate.d" ${INSTALL_FILE} etc/x2gobroker-wsgi.apache.{conf,vhost} \ - "${DESTDIR}${ETCDIR}/" + "${DESTDIR}${ETCDIR}/" ${INSTALL_FILE} logrotate/x2gobroker-wsgi "${DESTDIR}/etc/logrotate.d/" # x2gobroker mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}" \ - "${DESTDIR}${MANDIR}/man8" + "${DESTDIR}${MANDIR}/man8" ${INSTALL_FILE} man/man8/x2gobroker{,-keygen,-testauth}.8* \ - "${DESTDIR}${MANDIR}/man8" - ${INSTALL_PROGRAM} bin/x2gobroker-testauth "${DESTDIR}${BINDIR}/" - ${INSTALL_PROGRAM} sbin/x2gobroker sbin/x2gobroker-keygen \ - "${DESTDIR}${SBINDIR}/" + "${DESTDIR}${MANDIR}/man8" + ${INSTALL_PROGRAM} bin/x2gobroker bin/x2gobroker-testauth \ + "${DESTDIR}${BINDIR}/" + ${INSTALL_PROGRAM} sbin/x2gobroker-keygen "${DESTDIR}${SBINDIR}/" diff --git a/NEWS b/NEWS index ec72a39..d1f4575 100644 --- a/NEWS +++ b/NEWS @@ -1,12 +1,34 @@ NEWS on X2Go Session Broker =========================== -X2Go Session Broker is a Web project that provides -session brokerage for X2Go via HTTP(S). +x2gobroker (0.0.3.0) -The framework was originally designed in Perl and has -been rewritten in Python using the web.py framework -in 2012/2013. + X2Go Session Broker can now also be used directly via SSH connection. + Over the SSH wire the x2gobroker executable simply gets called + as a command line tool. -light+love, -Mike Gabriel, 20121129 + x2goclient --broker-url=ssh://<user>@<host>/usr/bin/x2gobroker + + The default behaviour now actually is the SSH command line mode. + To enable HTTP(S) standalone daemon mode, you now have to explicit + add --mode HTTP as command line option. + + For those who package X2Go Session Broker for some GNU or BSD distribution, + please make sure that you add this new compulsory command line option + to the start section in your init script / service file. + + Furthermore, the x2gobroker executable now installs to /usr/bin (as + opposed to /usr/sbin like it used to be in earlier versions). + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, Sun, 18 Aug 2013 20:20:39 +0200 + +x2gobroker (0.0.0.1) + + X2Go Session Broker is a Web project that provides + session brokerage for X2Go via HTTP(S). + + The framework was originally designed in Perl and has + been rewritten in Python using the tornado.py framework + in 2012/2013. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, Xxx, 29 Nov 2012 18:00:00 +0100 diff --git a/sbin/x2gobroker b/bin/x2gobroker similarity index 96% rename from sbin/x2gobroker rename to bin/x2gobroker index 99d4422..81d59b2 100755 --- a/sbin/x2gobroker +++ b/bin/x2gobroker @@ -44,7 +44,8 @@ if x2gobroker.defaults.X2GOBROKER_DEBUG and not x2gobroker.defaults.X2GOBROKER_T logger_access.setLevel(logging.DEBUG) logger_error.setLevel(logging.DEBUG) -logger_broker.info('X2Go Session Broker ({version}), written by {author}'.format(version=__VERSION__, author=__AUTHOR__)) +logger_broker.info('X2Go Session Broker ({version}),'.format(version=__VERSION__)) +logger_broker.info(' written by {author}'.format(author=__AUTHOR__)) logger_broker.info('Setting up the broker\'s environment...') logger_broker.info(' X2GOBROKER_DEBUG: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_DEBUG)) logger_broker.info(' X2GOBROKER_CONFIG: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_CONFIG)) @@ -115,6 +116,13 @@ if __name__ == "__main__": logger_broker.warn('ignoring option --sid as it only has a meaning with ,,--task selectsession\'\'') if cmdline_args.user is None: cmdline_args.user = os.environ['LOGNAME'] + if cmdline_args.task is None: + print("") + p.print_usage() + print("No task specified, doing nothing..."); + print("") + sys.exit(-2) + elif cmdine_args.mode.upper() == 'HTTP': if interactive_mode_warning: logger_broker.warn('X2Go Session Broker has been started interactively by user {username}, better run as user {daemon_username}.'.format(username=x2gobroker.defaults.X2GOBROKER_USER, daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) diff --git a/debian/changelog b/debian/changelog index f4e87f8..f94f27e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.0.3.0): - Add SSH support to X2Go Session Broker. (Fixes: #153). + - Move x2gobroker executable to /usr/bin. - Fix logrotate script: x2gobroker-wsgi. (Fixes: #275). * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/debian/x2gobroker-wsgi.links b/debian/x2gobroker-wsgi.links index e1659e5..cb9db8a 100644 --- a/debian/x2gobroker-wsgi.links +++ b/debian/x2gobroker-wsgi.links @@ -1,2 +1,2 @@ -/etc/x2go/x2gobroker-wsgi.apache.conf /etc/apache2/conf.d/x2gobroker-wsgi +/etc/x2go/x2gobroker-wsgi.apache.conf /etc/apache2/conf.d/x2gobroker-wsgi.conf /etc/x2go/x2gobroker-wsgi.apache.vhost /etc/apache2/sites-available/x2gobroker diff --git a/debian/x2gobroker.install b/debian/x2gobroker.install index adad505..bf0e5f5 100644 --- a/debian/x2gobroker.install +++ b/debian/x2gobroker.install @@ -1,3 +1,3 @@ +bin/x2gobroker usr/bin/ bin/x2gobroker-testauth usr/bin/ -sbin/x2gobroker usr/sbin/ sbin/x2gobroker-keygen usr/sbin/ diff --git a/debian/x2gobroker.manpages b/debian/x2gobroker.manpages index 71c3e08..2942f0c 100644 --- a/debian/x2gobroker.manpages +++ b/debian/x2gobroker.manpages @@ -1,3 +1,3 @@ -man/man8/x2gobroker.8 +man/man1/x2gobroker.1 +man/man1/x2gobroker-testauth.1 man/man8/x2gobroker-keygen.8 -man/man8/x2gobroker-testauth.8 diff --git a/etc/x2gobroker-wsgi.apache.conf b/etc/x2gobroker-wsgi.apache.conf index 63ba34a..6ac20a0 100644 --- a/etc/x2gobroker-wsgi.apache.conf +++ b/etc/x2gobroker-wsgi.apache.conf @@ -28,10 +28,10 @@ SetEnv X2GOBROKER_DEFAULT_BACKEND zeroconf # if you have to-be-statically-served files somewhere below the broker URL #Alias /x2gobroker/static /some/static/path/ -WSGIScriptAlias /x2gobroker /usr/sbin/x2gobroker +WSGIScriptAlias /x2gobroker /usr/bin/x2gobroker WSGIProcessGroup x2gobroker -<Directory /usr/sbin/x2gobroker> +<Directory /usr/bin/x2gobroker> Order deny,allow Deny from all diff --git a/etc/x2gobroker-wsgi.apache.vhost b/etc/x2gobroker-wsgi.apache.vhost index 931f7d2..4d024fe 100644 --- a/etc/x2gobroker-wsgi.apache.vhost +++ b/etc/x2gobroker-wsgi.apache.vhost @@ -42,10 +42,10 @@ # if you have to-be-statically-served files somewhere below the broker URL #Alias /x2gobroker/static /some/static/path/ - WSGIScriptAlias / /usr/sbin/x2gobroker + WSGIScriptAlias / /usr/bin/x2gobroker WSGIProcessGroup x2gobroker - <Directory /usr/sbin/x2gobroker> + <Directory /usr/bin/x2gobroker> Order deny,allow Deny from all diff --git a/init/x2gobroker-daemon.init b/init/x2gobroker-daemon.init index 0a8b90a..d049d0a 100755 --- a/init/x2gobroker-daemon.init +++ b/init/x2gobroker-daemon.init @@ -18,7 +18,7 @@ set -eu -DAEMON=/usr/sbin/x2gobroker +DAEMON=/usr/bin/x2gobroker test -d /run && RUNDIR=/run || RUNDIR=/var/run PIDFILE_BROKER=$RUNDIR/x2gobroker/x2gobroker-daemon.pid DEBIANCONFIG_COMMON=/etc/default/python-x2gobroker @@ -92,7 +92,7 @@ case "${1:-}" in if is_true $START_BROKER; then log_daemon_msg "Starting X2Go Session Broker standalone daemon" "$(basename $DAEMON)" set +e - start-stop-daemon --chuid $X2GOBROKER_DAEMON_USER -b -m -S -p $PIDFILE_BROKER -x $DAEMON -- -b $DAEMON_BIND_ADDRESS + start-stop-daemon --chuid $X2GOBROKER_DAEMON_USER -b -m -S -p $PIDFILE_BROKER -x $DAEMON -- --mode HTTP -b $DAEMON_BIND_ADDRESS log_end_msg $? set -e fi diff --git a/man/man8/x2gobroker-testauth.8 b/man/man1/x2gobroker-testauth.1 similarity index 96% rename from man/man8/x2gobroker-testauth.8 rename to man/man1/x2gobroker-testauth.1 index b7e2278..b9f41a2 100644 --- a/man/man8/x2gobroker-testauth.8 +++ b/man/man1/x2gobroker-testauth.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobroker-testauth 8 "April 2013" "Version 0.0.1.y" "X2Go Session Broker" +.TH x2gobroker-testauth 1 "Aug 2013" "Version 0.0.3.x" "X2Go Session Broker" .SH NAME x2gobroker-testauth \- Session Broker for X2Go (Authentication Test Utility) .SH SYNOPSIS diff --git a/man/man8/x2gobroker.8 b/man/man1/x2gobroker.1 similarity index 96% rename from man/man8/x2gobroker.8 rename to man/man1/x2gobroker.1 index ec5ac10..bc1425e 100644 --- a/man/man8/x2gobroker.8 +++ b/man/man1/x2gobroker.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobroker 8 "Feb 2013" "Version 0.0.1.y" "X2Go Session Broker" +.TH x2gobroker 1 "Aug 2013" "Version 0.0.3.x" "X2Go Session Broker" .SH NAME x2gobroker \- Session Broker for X2Go .SH SYNOPSIS diff --git a/man/man8/x2gobroker-authservice.8 b/man/man8/x2gobroker-authservice.8 index 59a3938..ee3b16d 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 2013" "Version 0.0.1.y" "X2Go Session Broker" +.TH x2gobroker-authservice 8 "Aug 2013" "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-keygen.8 b/man/man8/x2gobroker-keygen.8 index b17b5d2..0ce9467 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 2013" "Version 0.0.1.y" "X2Go Session Broker" +.TH x2gobroker-keygen 8 "Aug 2013" "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 4602ce8..9e4693f 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 2013" "Version 0.0.1.y" "X2Go Session Broker" +.TH x2gobroker-pubkeyauthorizer 8 "Aug 2013" "Version 0.0.3.x" "X2Go Session Broker" .SH NAME x2gobroker-pubkeyauthorizer \- Retrieve public SSH keys from an X2Go Session Broker .SH SYNOPSIS 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).