x2go-commits

x2go-commits@lists.x2go.org

1 participants
37914 discussions

x2gobroker.git - build-main (branch) updated: 0.0.2.0-15-g6a86e5a
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 6a86e5a9784fdb3f5bfdb6e812a8895c29ef6c5d (commit) from c485372401718f61f7bf6d3b1d66617ad12d49ff (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Makefile | 27 +++++++++++++++++++++------ debian/changelog | 2 ++ 2 files changed, 23 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 8b10c5e..7a4f317 100755 --- a/Makefile +++ b/Makefile @@ -59,7 +59,6 @@ build_setuidwrappers: $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gobroker-agent.pl\" -o lib/x2gobroker-agent src/x2gobroker-agent.c build-indep: -# run setup.py build+install somewhere here... distclean: clean @@ -78,7 +77,10 @@ install: # python-x2gobroker python setup.py install --prefix="${PREFIX}" $${DESTDIR+--root="${DESTDIR}"} - mkdir -p "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/pam.d" + mkdir -p "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/pam.d" \ + "${DESTDIR}/etc/default" + ${INSTALL_FILE} defaults/python-x2gobroker.default \ + "${DESTDIR}/etc/default/python-x2gobroker" ${INSTALL_FILE} etc/x2gobroker.conf "${DESTDIR}${ETCDIR}/" ${INSTALL_FILE} etc/broker/x2gobroker-sessionprofiles.conf \ etc/broker/x2gobroker-loggers.conf \ @@ -87,13 +89,21 @@ install: ${INSTALL_FILE} pam/x2gobroker "${DESTDIR}/etc/pam.d/" # x2gobroker-agent - mkdir -p "${DESTDIR}${LIBDIR}" "${DESTDIR}${SBINDIR}" + mkdir -p "${DESTDIR}${LIBDIR}" "${DESTDIR}${SBINDIR}" \ + "${DESTDIR}${MANDIR}/man8" + ${INSTALL_FILE} man/man8/x2gobroker-pubkeyauthorizer.8* \ + "${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}${ETCDIR}/broker" "${DESTDIR}/etc/default" \ + "${DESTDIR}${MANDIR}/man8" + ${INSTALL_FILE} defaults/x2gobroker-authservice.default \ + "${DESTDIR}/etc/default/x2gobroker-authservice" + ${INSTALL_FILE} man/man8/x2gobroker-authservice.8* \ + "${DESTDIR}${MANDIR}/man8" ${INSTALL_PROGRAM} sbin/x2gobroker-authservice "${DESTDIR}${SBINDIR}/" ${INSTALL_FILE} logrotate/x2gobroker-authservice \ "${DESTDIR}/etc/logrotate.d/" @@ -101,7 +111,9 @@ install: "${DESTDIR}${ETCDIR}/broker/" # x2gobroker-daemon - mkdir -p "${DESTDIR}/etc/logrotate.d/" + mkdir -p "${DESTDIR}/etc/logrotate.d/" "${DESTDIR}/etc/default" + ${INSTALL_FILE} defaults/x2gobroker-daemon.default \ + "${DESTDIR}/etc/default/x2gobroker-daemon" ${INSTALL_FILE} logrotate/x2gobroker-daemon \ "${DESTDIR}/etc/logrotate.d/" @@ -112,7 +124,10 @@ install: ${INSTALL_FILE} logrotate/x2gobroker-wsgi "${DESTDIR}/etc/logrotate.d/" # x2gobroker - mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}" + mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}" \ + "${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}/" diff --git a/debian/changelog b/debian/changelog index fb9787e..448093d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low [ Jan Engelhardt ] * New upstream version (0.0.2.1): - Populate install target of Makefile. (Fixes: #201). + - Install man pages and default files through Makefile, as well. (Fixes: + #211). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 May 2013 21:07:41 +0200 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).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.0-6-g1cbf2c3
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 1cbf2c397ba3253681e4303e52017da30f48f2eb (commit) from 32d9d26f987613ad9d4fe7893ce07241975707af (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker-pubkeyauthorizer | 4 ---- 1 file changed, 4 deletions(-) The diff of changes is: diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index 2308a72..f6ebaa4 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -55,10 +55,6 @@ if os.environ.has_key('X2GOBROKER_DAEMON_GROUP'): X2GOBROKER_DAEMON_GROUP=os.environ['X2GOBROKER_DAEMON_GROUP'] else: X2GOBROKER_DAEMON_GROUP="x2gobroker" -if os.environ.has_key('X2GOBROKER_LOGCONFIG'): - X2GOBROKER_LOGCONFIG=os.environ['X2GOBROKER_LOGCONFIG'] -else: - X2GOBROKER_LOGCONFIG="/etc/x2go/broker/x2gobroker-loggers.conf" if os.environ.has_key('X2GOBROKER_DEBUG'): X2GOBROKER_DEBUG = ( os.environ['X2GOBROKER_DEBUG'].lower() in ('1', 'on', 'true', 'yes', ) ) else: 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).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.0-5-g32d9d26
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 32d9d26f987613ad9d4fe7893ce07241975707af (commit) from 3e0b0a48d874da2238d8fbb725f476a87f9f51ca (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: etc/x2gobroker.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index cf544bb..a64361b 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -104,7 +104,7 @@ # immediately. # # This option can be overridden by the session profile parameter -# broker-session-autologin=<file-location> +# broker-session-autologin={true|false} #default-session-autologin=false 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).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.0-2-ga43eae3
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via a43eae3a35698c7e8f39a6a70fb159bfbaea3f61 (commit) from a40d31fd015bb02c750866712b20574723cc3978 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- x2gobroker/uccsjson.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6aa021a..aa10d08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.0.2.0): + - Remove trainling slashes from ManagementServer URLs. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 May 2013 21:07:41 +0200 diff --git a/x2gobroker/uccsjson.py b/x2gobroker/uccsjson.py index 8393a59..757dc67 100644 --- a/x2gobroker/uccsjson.py +++ b/x2gobroker/uccsjson.py @@ -49,6 +49,7 @@ class ManagementServer(): self.RemoteDesktopServers = [] self.AdditionalManagementServers = [] self.URL = unicode(url) + self.URL = '{url}/'.format(url=self.URL.rstrip('/')) self.Name = unicode(name) def set_default(self, ts_name): 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).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.0-3-gb82e0ec
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via b82e0ece59e929ba5245f483f0ee7a1b9c4ba37f (commit) from a43eae3a35698c7e8f39a6a70fb159bfbaea3f61 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/copyright b/debian/copyright index 7b2fde0..fdf8b88 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: X2Go Broker +Upstream-Name: X2Go Session Broker Upstream-Contact: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> 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).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.0-1-ga40d31f
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via a40d31fd015bb02c750866712b20574723cc3978 (commit) from 363a8fb21e215d403ef81c9bfc0d079d431bacce (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ sbin/x2gobroker-pubkeyauthorizer | 2 +- x2gobroker/__init__.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5e6f6ae..6aa021a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 May 2013 21:07:41 +0200 + x2gobroker (0.0.2.0-0~x2go1) unstable; urgency=low * New upstream version (0.0.2.0): diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index ff47173..2308a72 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -36,7 +36,7 @@ import logging.config from pwd import getpwnam from grp import getgrnam -__VERSION__ = '0.0.1.2' +__VERSION__ = '0.0.2.1' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' PROG_NAME = os.path.basename(sys.argv[0]) diff --git a/x2gobroker/__init__.py b/x2gobroker/__init__.py index 8da3542..d5c3162 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/__init__.py @@ -18,5 +18,5 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.0.1.2' +__VERSION__ = '0.0.2.1' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.0-21-ge0e9815
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, master has been updated via e0e9815beaf7d6de843ca0386cd92ed6cd14433f (commit) from f4026757bca650305a06382ca5521117ff82b4ee (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 e0e9815beaf7d6de843ca0386cd92ed6cd14433f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun May 19 12:42:59 2013 +0200 release 0.0.2.1 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c9d5d8e..badca68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low +x2gobroker (0.0.2.1-0~x2go1) unstable; urgency=low [ Mike Gabriel ] * New upstream version (0.0.2.1): - - Remove trainling slashes from ManagementServer URLs. + - Remove trailing slashes from ManagementServer URLs. - In Apache2 vhost configuration example, move WSGI environment variable settings into VirtualHost setup. - Remove unused, not-yet-developed broker backends and frontends. @@ -14,8 +14,8 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low backend name. - In WSGI mode: only populate os.environ with variables matching »X2GOBROKER_*«. - - Make X2GOBROKER_SESSIONPROFILES configurable through a SetEnv WSGI - parameter in the httpd configuration. (Fixes: #210). + - Make X2GOBROKER_SESSIONPROFILES configurable via a SetEnv WSGI parameter + in the httpd configuration possible. (Fixes: #210). * Provide init scripts and *.default files outside of /debian folder (as they are also relevant for non-Debian packaging). @@ -25,7 +25,7 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low - Install man pages and default files through Makefile, as well. (Fixes: #211). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 May 2013 21:07:41 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 12:41:06 +0200 x2gobroker (0.0.2.0-0~x2go1) unstable; urgency=low 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.0-20-gf402675
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, master has been updated via f4026757bca650305a06382ca5521117ff82b4ee (commit) from a8dbd6b888cf3b9321ecd42086defc68532e774f (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 f4026757bca650305a06382ca5521117ff82b4ee Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun May 19 12:40:26 2013 +0200 catch ValueError on non-resolvable hostnames, comment out client-ACL in x2gobroker-sessionprofiles.conf to avoid non-resolvable hostname ----------------------------------------------------------------------- Summary of changes: etc/broker/x2gobroker-sessionprofiles.conf | 5 +++-- x2gobroker/brokers/base_broker.py | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf index 8d060ec..84bfc44 100644 --- a/etc/broker/x2gobroker-sessionprofiles.conf +++ b/etc/broker/x2gobroker-sessionprofiles.conf @@ -139,8 +139,9 @@ name=LXDE - srv-D command=LXDE acl-groups-allow=admins acl-groups-deny=ALL -acl-clients-deny=ALL -acl-clients-allow=admin-machine1.domain.local, admin-machine2.domain.local, admin-machine3.domain.local +## make sure hostnames in client ACLs are resolvable via libnss!!! +#acl-clients-deny=ALL +#acl-clients-allow=admin-machine1.domain.local, admin-machine2.domain.local, admin-machine3.domain.local acl-any-order=deny-allow ## diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 2ce0ba4..590087a 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -336,6 +336,8 @@ class X2GoBroker(object): _deny_address_set = netaddr.IPSet(_acls_clients_deny) except netaddr.core.AddrFormatError, e: logger_error.error('base_broker.X2GoBroker.check_acls(): netaddr.core.AddrFormatError - {why}'.format(why=str(e))) + except ValueError, e: + logger_error.error('base_broker.X2GoBroker.check_acls(): ValueError - {why}'.format(why=str(e))) _allow_client = self._client_address in _allow_address_set _deny_client = self._client_address in _deny_address_set 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.0-17-g703353d
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, master has been updated via 703353dd9fc0031109cf4af4d8b497efbf6013b1 (commit) from adcedf70d52d663534be1dcbf2e4f837516cd42c (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 703353dd9fc0031109cf4af4d8b497efbf6013b1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun May 19 12:37:43 2013 +0200 In WSGI mode: only populate os.environ with variables matching »X2GOBROKER_*«. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ sbin/x2gobroker | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8eb7e11..a78bfda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low Thanks to Richard Weinberger for spotting this!!! - Handle URLs in plain WebUI that have slashes (and subpaths) in the backend name. + - In WSGI mode: only populate os.environ with variables matching + »X2GOBROKER_*«. * Provide init scripts and *.default files outside of /debian folder (as they are also relevant for non-Debian packaging). diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 63823b4..c88eb97 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -157,7 +157,9 @@ else: del environ['SCRIPT_NAME'] # make sure the httpd server's environment is set as os.environ - os.environ = environ + for key in environ.keys(): + if key.startswith('X2GOBROKER_'): + os.environ.update({ key: environ[key] }) reload(x2gobroker.defaults) return _tornado_application(environ, start_response) 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.0-16-gadcedf7
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, master has been updated via adcedf70d52d663534be1dcbf2e4f837516cd42c (commit) from 6a86e5a9784fdb3f5bfdb6e812a8895c29ef6c5d (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 adcedf70d52d663534be1dcbf2e4f837516cd42c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun May 19 12:36:18 2013 +0200 Handle URLs in plain WebUI that have slashes (and subpaths) in the backend name. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2gobroker/web/plain.py | 2 ++ 2 files changed, 4 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 448093d..8eb7e11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low - Security fix for setuid wrapper x2gobroker-agent.c. Hard-code path to x2gobroker-agent.pl during build via defining a macro in the Makefile. Thanks to Richard Weinberger for spotting this!!! + - Handle URLs in plain WebUI that have slashes (and subpaths) in the + backend name. * Provide init scripts and *.default files outside of /debian folder (as they are also relevant for non-Debian packaging). diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index ca041df..0607bf2 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -56,6 +56,8 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): backend = x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND else: backend = backend.rstrip('/') + if '/' in backend: + backend = backend.split('/')[0] # silence pyflakes... broker_backend = None 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).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits