x2go-commits November 2013

x2go-commits@lists.x2go.org

2 participants
391 discussions

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.8-6-g510a53d
by git-admin＠x2go.org 27 Nov '13

27 Nov '13

The branch, release/4.0.1.x has been updated via 510a53db403de441a7eb02472380e91f192461fa (commit) from 86bbc0209c99902125bbd8ab8a9e14505b64389f (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 510a53db403de441a7eb02472380e91f192461fa Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 27 15:13:17 2013 +0100 debian/source/format: Switch to format 1.0. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 793305a..2f032db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -132,7 +132,10 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low x2goserver (4.0.0.7-0~x2go1) UNRELEASED; urgency=low - * Continue development for LTS release branch... + * New upstream version (4.0.0.7): + - Continue development for LTS branch... + * debian/source/format: + + Switch to format 1.0. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Nov 2013 22:52:31 +0100 hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2gomatebindings.git - master (branch) updated: 0.0.1.1-7-g0849b6a
by git-admin＠x2go.org 27 Nov '13

27 Nov '13

The branch, master has been updated via 0849b6a9799bf93387364f88de2a1aabd7c22576 (commit) from a1def4499d05cfea1a825ab93faae40050262574 (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 0849b6a9799bf93387364f88de2a1aabd7c22576 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 27 15:11:23 2013 +0100 debian/source/format: Switch to format 1.0. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 +++++--- debian/source/format | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7ea9214..9298b3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,11 @@ x2gomatebindings (0.0.1.2-0~x2go1) UNRELEASED; urgency=low * New upstream release (0.0.1.2): - Continue development... * debian/control: - - Update LONG_DESCRIPTION. - - Add dependency: libgtk2.0-bin | libgtk-3-bin. - - Depend on gnome-colors-common and caja (>= 1.6.0). + + Update LONG_DESCRIPTION. + + Add dependency: libgtk2.0-bin | libgtk-3-bin. + + Depend on gnome-colors-common and caja (>= 1.6.0). + * debian/source/format: + + Switch to format 1.0. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 18:35:22 +0200 diff --git a/debian/source/format b/debian/source/format index 89ae9db..d3827e7 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +1.0 hooks/post-receive -- x2gomatebindings.git (MATE bindings 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 "x2gomatebindings.git" (MATE bindings for X2Go).

1 0

x2golxdebindings.git - master (branch) updated: 1.0.2.0-10-g6222dcf
by git-admin＠x2go.org 27 Nov '13

27 Nov '13

The branch, master has been updated via 6222dcfb237b13b9ca155d517f734f501d532906 (commit) from 72a8f2ce4f0f8db3876f247842f20e10221600d7 (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 6222dcfb237b13b9ca155d517f734f501d532906 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 27 15:10:30 2013 +0100 debian/source/format: Switch to format 1.0. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- debian/source/format | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4ab76b6..7a273e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,9 +2,11 @@ x2golxdebindings (1.0.2.2-0~x2go1) UNRELEASED; urgency=low * New upstream version (1.0.2.2): - Continue development... - * /debian/control: + * debian/control: + Add dependency: libgtk2.0-bin | libgtk-3-bin. (Fixes: #277). + Update SYNOPSIS and LONG_DESCRIPTION. + * debian/source/format: + + Switch to format 1.0. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 18:22:50 +0200 diff --git a/debian/source/format b/debian/source/format index 9f67427..d3827e7 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) \ No newline at end of file +1.0 hooks/post-receive -- x2golxdebindings.git (LXDE bindings 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 "x2golxdebindings.git" (LXDE bindings for X2Go).

1 0

x2golxdebindings.git - master (branch) updated: 1.0.2.0-9-g72a8f2c
by git-admin＠x2go.org 27 Nov '13

27 Nov '13

The branch, master has been updated via 72a8f2ce4f0f8db3876f247842f20e10221600d7 (commit) from 8d1652c06030eeb94352fe8d34d45cc719c78c61 (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 72a8f2ce4f0f8db3876f247842f20e10221600d7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 30 22:32:50 2013 +0200 lower case in English text ----------------------------------------------------------------------- Summary of changes: debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/control b/debian/control index fdf32d8..bae7ced 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Description: LXDE bindings for X2Go X2Go is a server based computing environment with - session resuming - low bandwidth support - - Session Brokerage Support + - session brokerage support - client-side mass storage mounting support - client-side printing support - audio support hooks/post-receive -- x2golxdebindings.git (LXDE bindings 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 "x2golxdebindings.git" (LXDE bindings for X2Go).

1 0

x2godesktopsharing.git - master (branch) updated: 3.1.1.0-7-g8beca29
by git-admin＠x2go.org 27 Nov '13

27 Nov '13

The branch, master has been updated via 8beca2926ad1c4f9f385af2d7ffacfdd0b21fd2c (commit) from d90f6e7dd5c86096a367164d2d4414184d8d96b5 (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 8beca2926ad1c4f9f385af2d7ffacfdd0b21fd2c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 27 15:09:40 2013 +0100 debian/source/format: Switch to format 1.0. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- debian/source/format | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c8b6124..fafc010 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ x2godesktopsharing (3.1.1.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.1.1.1): - Update man pages (Fixes: #281). - * /debian/control: + * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + * debian/source/format: + Switch to format 1.0. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 08 Jun 2013 01:13:44 +0200 diff --git a/debian/source/format b/debian/source/format index 89ae9db..d3827e7 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +1.0 hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing 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 "x2godesktopsharing.git" (Desktop Sharing for X2Go).

1 0

x2goclient2.git - master (branch) updated: 81f0aece7d3be6f40ace4bc9b40678d7c7030ba6
by git-admin＠x2go.org 27 Nov '13

27 Nov '13

The branch, master has been updated via 81f0aece7d3be6f40ace4bc9b40678d7c7030ba6 (commit) from 8f281453d5c9c589330c4e65e58235d0b0d717fa (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 81f0aece7d3be6f40ace4bc9b40678d7c7030ba6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 27 15:09:02 2013 +0100 debian/source/format: Switch to format 1.0. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 +++++- debian/control | 2 +- debian/source/format | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ffa12ba..c7d76f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ x2goclient2 (0.0.0.1-0~x2go1) UNRELEASED; urgency=low + [ Oleksandr Shneyder ] * Initial release - -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Sat, 08 June 2013 00:00:00 +0200 + [ Mike Gabriel ] + * debian/source/format: + + Switch to format 1.0. + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Sat, 08 June 2013 00:00:00 +0200 diff --git a/debian/control b/debian/control index 2a66589..293ee6a 100644 --- a/debian/control +++ b/debian/control @@ -40,7 +40,7 @@ Description: X2Go Client 2 application (Qt4) X2Go is a serverbased computing environment with - session resuming - low bandwidth support - - LDAP support + - session brokerage support - client-side mass storage mounting support - client-side printing support - audio support diff --git a/debian/source/format b/debian/source/format index 89ae9db..d3827e7 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +1.0 hooks/post-receive -- x2goclient2.git (X2Go Client 2 (rewrite of x2goclient.git)) 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 "x2goclient2.git" (X2Go Client 2 (rewrite of x2goclient.git)).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-71-ge5934b6
by git-admin＠x2go.org 27 Nov '13

27 Nov '13

The branch, master has been updated via e5934b60b41789103445dbed922ca0563787625f (commit) from 006c44f98ec4eb12fdd8939be9aae429cbbec173 (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 e5934b60b41789103445dbed922ca0563787625f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 27 15:08:27 2013 +0100 debian/source/format: Switch to format 1.0. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++-- debian/source/format | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 61c0dc3..4025e53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,14 +58,16 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low python-x2gobroker's docs folder. - Show correct environment variables in log file prelude when WSGI is used. - Fix check-credentials = false for UCCS web frontend. - * /debian/control: + * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Recommend apache2 and libapache2-mod-wsgi for x2gobroker-wsgi. - * /debian/x2gobroker-agent.dirs: + * debian/x2gobroker-agent.dirs: + Provide empty log file directory. * x2gobroker-wsgi postinst/postrm: + Make bin:package x2gobroker-wsgi compliant Debian's packaging style of Apache2.4 / Apache2.2. + * debian/source/format: + + Switch to format 1.0. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:25:30 +0200 diff --git a/debian/source/format b/debian/source/format index 89ae9db..9f8e9b6 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +1.0 \ No newline at end of file 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.3-70-g006c44f
by git-admin＠x2go.org 27 Nov '13

27 Nov '13

The branch, master has been updated via 006c44f98ec4eb12fdd8939be9aae429cbbec173 (commit) from d5365c2da01d513ae3886916c3d628762ce1dc22 (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 006c44f98ec4eb12fdd8939be9aae429cbbec173 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 27 15:07:38 2013 +0100 Revert "debian/source/format: Switch to format 1.0." This reverts commit d5365c2da01d513ae3886916c3d628762ce1dc22. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++---- debian/source/format | 2 +- debian/x2gobroker.install | 1 - x2gobroker/agent.py | 30 +++++++++++------------------- 4 files changed, 14 insertions(+), 25 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4025e53..61c0dc3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,16 +58,14 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low python-x2gobroker's docs folder. - Show correct environment variables in log file prelude when WSGI is used. - Fix check-credentials = false for UCCS web frontend. - * debian/control: + * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Recommend apache2 and libapache2-mod-wsgi for x2gobroker-wsgi. - * debian/x2gobroker-agent.dirs: + * /debian/x2gobroker-agent.dirs: + Provide empty log file directory. * x2gobroker-wsgi postinst/postrm: + Make bin:package x2gobroker-wsgi compliant Debian's packaging style of Apache2.4 / Apache2.2. - * debian/source/format: - + Switch to format 1.0. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:25:30 +0200 diff --git a/debian/source/format b/debian/source/format index 9f8e9b6..89ae9db 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 \ No newline at end of file +3.0 (native) diff --git a/debian/x2gobroker.install b/debian/x2gobroker.install index f4fd48a..bf0e5f5 100644 --- a/debian/x2gobroker.install +++ b/debian/x2gobroker.install @@ -1,4 +1,3 @@ bin/x2gobroker usr/bin/ -bin/x2gobroker-testagent usr/bin/ bin/x2gobroker-testauth usr/bin/ sbin/x2gobroker-keygen usr/sbin/ diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index d7b81df..914dd9d 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -36,8 +36,6 @@ import x2gobroker.x2gobroker_exceptions from x2gobroker.loggers import logger_broker, logger_error - - class delayed_execution(threading.Thread): def __init__(self, agent_func, delay=0, **kwargs): @@ -168,7 +166,7 @@ def call_remote_broker_agent(username, mode, cmdline_args=[], remote_agent=None) raise x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException('Query to remote X2Go Broker Agent (user: {user}, hostname: {hostname}, port: {port}) failed'.format(user=remote_username, hostname=remote_hostname, port=remote_port)) -def ping_icmp(hostname, **kwargs): +def icmp_ping(hostname): """\ Perform an ICMP ping to the requested hostname. @@ -197,7 +195,7 @@ def ping_icmp(hostname, **kwargs): return True -def ping(query_mode='LOCAL', remote_agent=None, **kwargs): +def ping(query_mode='LOCAL', remote_agent=None): """\ Ping X2Go Broker Agent. @@ -212,11 +210,11 @@ def ping(query_mode='LOCAL', remote_agent=None, **kwargs): return call_local_broker_agent(username, mode='ping') else: return remote_agent is not None and \ - ping_icmp(remote_agent['hostname']) and \ + icmp_ping(remote_agent['hostname']) and \ call_remote_broker_agent(username, mode='ping', remote_agent=remote_agent) -def list_sessions(username, query_mode='LOCAL', remote_agent=None, **kwargs): +def list_sessions(username, query_mode='LOCAL', remote_agent=None): """\ Query X2Go Broker Agent for a session list for a given username. @@ -234,7 +232,7 @@ def list_sessions(username, query_mode='LOCAL', remote_agent=None, **kwargs): return call_remote_broker_agent(username, mode='listsessions', remote_agent=remote_agent) -def suspend_session(username, session_name, query_mode='LOCAL', remote_agent=None, **kwargs): +def suspend_session(username, session_name, query_mode='LOCAL', remote_agent=None): """\ Trigger a session suspensions via the X2Go Broker Agent. @@ -252,7 +250,7 @@ def suspend_session(username, session_name, query_mode='LOCAL', remote_agent=Non return call_remote_broker_agent(username, mode='suspendsession', cmdline_args=[session_name, ], remote_agent=remote_agent) -def terminate_session(username, session_name, query_mode='LOCAL', remote_agent=None, **kwargs): +def terminate_session(username, session_name, query_mode='LOCAL', remote_agent=None): """\ Trigger a session termination via the X2Go Broker Agent. @@ -270,7 +268,7 @@ def terminate_session(username, session_name, query_mode='LOCAL', remote_agent=N return call_remote_broker_agent(username, mode='terminatesession', cmdline_args=[session_name, ], remote_agent=remote_agent) -def has_sessions(username, query_mode='LOCAL', remote_agent=None, **kwargs): +def has_sessions(username, query_mode='LOCAL', remote_agent=None): """\ Query X2Go Broker Agent to detect running/suspended sessions on the remote X2Go Server (farm). @@ -289,7 +287,7 @@ def has_sessions(username, query_mode='LOCAL', remote_agent=None, **kwargs): _session_list = list_sessions(username, query_mode=query_mode, remote_agent=remote_agent) return ([ s.split('|')[3] for s in _session_list if s.split('|')[4] == 'R' ], [ s.split('|')[3] for s in _session_list if s.split('|')[4] == 'S' ]) -def find_busy_servers(username, query_mode='LOCAL', remote_agent=None, **kwargs): +def find_busy_servers(username, query_mode='LOCAL', remote_agent=None): """\ Query X2Go Broker Agent for a list of servers with running and/or suspended sessions and a percentage that tells about @@ -321,7 +319,7 @@ def find_busy_servers(username, query_mode='LOCAL', remote_agent=None, **kwargs) return server_usage -def add_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/authorized_keys', query_mode='LOCAL', remote_agent=None, **kwargs): +def add_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/authorized_keys', query_mode='LOCAL', remote_agent=None): """\ Add a public key hash to the user's authorized_keys file. @@ -343,7 +341,7 @@ def add_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/aut return call_remote_broker_agent(username, mode='addauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ], remote_agent=remote_agent) -def delete_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/authorized_keys', query_mode='LOCAL', remote_agent=None, delay_deletion=0, **kwargs): +def delete_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/authorized_keys', query_mode='LOCAL', remote_agent=None, delay_deletion=0): """\ Remove a public key hash from the user's authorized_keys file. @@ -375,7 +373,7 @@ def delete_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/ return call_remote_broker_agent(username, mode='delauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ], remote_agent=remote_agent) -def get_servers(username, query_mode='LOCAL', remote_agent=None, **kwargs): +def get_servers(username, query_mode='LOCAL', remote_agent=None): """\ Query X2Go Broker Agent for the list of currently used servers. @@ -435,9 +433,3 @@ def genkeypair(local_username, client_address, key_type='RSA'): privkey = privkey_obj.getvalue() return (pubkey, privkey) - -tasks_available = { - 'PING': ping, - 'PING_ICMP': ping_icmp, - 'LISTSESSIONS': list_sessions, -} 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

x2goclient.git - master (branch) updated: 4.0.1.1-29-g9126ca0
by git-admin＠x2go.org 27 Nov '13

27 Nov '13

The branch, master has been updated via 9126ca04938a5df91d0cd61768678db733e22dbf (commit) from 2cbf163320a11a5f832bfe6b8f201a1616d89496 (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 9126ca04938a5df91d0cd61768678db733e22dbf Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 27 15:07:23 2013 +0100 debian/source/format: Switch to format 1.0. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/source/format | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 12f6ae2..2b0286a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ x2goclient (4.0.1.2-0~x2go2) UNRELEASED; urgency=low via sessions file or cmdline parameter. - Syntax fix of x2goclient.desktop file. * Pull-in packaging changes from Debian. + * debian/source/format: + + Switch to format 1.0. [ Ricardo Díaz Martín ] * New upstream versino (4.0.1.2): diff --git a/debian/source/format b/debian/source/format index 89ae9db..d3827e7 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +1.0 hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-69-gd5365c2
by git-admin＠x2go.org 27 Nov '13

27 Nov '13

The branch, master has been updated via d5365c2da01d513ae3886916c3d628762ce1dc22 (commit) from b4603743e414a6fea2a82ee919955f4d7c7a797f (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 d5365c2da01d513ae3886916c3d628762ce1dc22 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 27 15:06:29 2013 +0100 debian/source/format: Switch to format 1.0. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++-- debian/source/format | 2 +- debian/x2gobroker.install | 1 + x2gobroker/agent.py | 30 +++++++++++++++++++----------- 4 files changed, 25 insertions(+), 14 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 61c0dc3..4025e53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,14 +58,16 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low python-x2gobroker's docs folder. - Show correct environment variables in log file prelude when WSGI is used. - Fix check-credentials = false for UCCS web frontend. - * /debian/control: + * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Recommend apache2 and libapache2-mod-wsgi for x2gobroker-wsgi. - * /debian/x2gobroker-agent.dirs: + * debian/x2gobroker-agent.dirs: + Provide empty log file directory. * x2gobroker-wsgi postinst/postrm: + Make bin:package x2gobroker-wsgi compliant Debian's packaging style of Apache2.4 / Apache2.2. + * debian/source/format: + + Switch to format 1.0. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:25:30 +0200 diff --git a/debian/source/format b/debian/source/format index 89ae9db..9f8e9b6 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +1.0 \ No newline at end of file diff --git a/debian/x2gobroker.install b/debian/x2gobroker.install index bf0e5f5..f4fd48a 100644 --- a/debian/x2gobroker.install +++ b/debian/x2gobroker.install @@ -1,3 +1,4 @@ bin/x2gobroker usr/bin/ +bin/x2gobroker-testagent usr/bin/ bin/x2gobroker-testauth usr/bin/ sbin/x2gobroker-keygen usr/sbin/ diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 914dd9d..d7b81df 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -36,6 +36,8 @@ import x2gobroker.x2gobroker_exceptions from x2gobroker.loggers import logger_broker, logger_error + + class delayed_execution(threading.Thread): def __init__(self, agent_func, delay=0, **kwargs): @@ -166,7 +168,7 @@ def call_remote_broker_agent(username, mode, cmdline_args=[], remote_agent=None) raise x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException('Query to remote X2Go Broker Agent (user: {user}, hostname: {hostname}, port: {port}) failed'.format(user=remote_username, hostname=remote_hostname, port=remote_port)) -def icmp_ping(hostname): +def ping_icmp(hostname, **kwargs): """\ Perform an ICMP ping to the requested hostname. @@ -195,7 +197,7 @@ def icmp_ping(hostname): return True -def ping(query_mode='LOCAL', remote_agent=None): +def ping(query_mode='LOCAL', remote_agent=None, **kwargs): """\ Ping X2Go Broker Agent. @@ -210,11 +212,11 @@ def ping(query_mode='LOCAL', remote_agent=None): return call_local_broker_agent(username, mode='ping') else: return remote_agent is not None and \ - icmp_ping(remote_agent['hostname']) and \ + ping_icmp(remote_agent['hostname']) and \ call_remote_broker_agent(username, mode='ping', remote_agent=remote_agent) -def list_sessions(username, query_mode='LOCAL', remote_agent=None): +def list_sessions(username, query_mode='LOCAL', remote_agent=None, **kwargs): """\ Query X2Go Broker Agent for a session list for a given username. @@ -232,7 +234,7 @@ def list_sessions(username, query_mode='LOCAL', remote_agent=None): return call_remote_broker_agent(username, mode='listsessions', remote_agent=remote_agent) -def suspend_session(username, session_name, query_mode='LOCAL', remote_agent=None): +def suspend_session(username, session_name, query_mode='LOCAL', remote_agent=None, **kwargs): """\ Trigger a session suspensions via the X2Go Broker Agent. @@ -250,7 +252,7 @@ def suspend_session(username, session_name, query_mode='LOCAL', remote_agent=Non return call_remote_broker_agent(username, mode='suspendsession', cmdline_args=[session_name, ], remote_agent=remote_agent) -def terminate_session(username, session_name, query_mode='LOCAL', remote_agent=None): +def terminate_session(username, session_name, query_mode='LOCAL', remote_agent=None, **kwargs): """\ Trigger a session termination via the X2Go Broker Agent. @@ -268,7 +270,7 @@ def terminate_session(username, session_name, query_mode='LOCAL', remote_agent=N return call_remote_broker_agent(username, mode='terminatesession', cmdline_args=[session_name, ], remote_agent=remote_agent) -def has_sessions(username, query_mode='LOCAL', remote_agent=None): +def has_sessions(username, query_mode='LOCAL', remote_agent=None, **kwargs): """\ Query X2Go Broker Agent to detect running/suspended sessions on the remote X2Go Server (farm). @@ -287,7 +289,7 @@ def has_sessions(username, query_mode='LOCAL', remote_agent=None): _session_list = list_sessions(username, query_mode=query_mode, remote_agent=remote_agent) return ([ s.split('|')[3] for s in _session_list if s.split('|')[4] == 'R' ], [ s.split('|')[3] for s in _session_list if s.split('|')[4] == 'S' ]) -def find_busy_servers(username, query_mode='LOCAL', remote_agent=None): +def find_busy_servers(username, query_mode='LOCAL', remote_agent=None, **kwargs): """\ Query X2Go Broker Agent for a list of servers with running and/or suspended sessions and a percentage that tells about @@ -319,7 +321,7 @@ def find_busy_servers(username, query_mode='LOCAL', remote_agent=None): return server_usage -def add_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/authorized_keys', query_mode='LOCAL', remote_agent=None): +def add_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/authorized_keys', query_mode='LOCAL', remote_agent=None, **kwargs): """\ Add a public key hash to the user's authorized_keys file. @@ -341,7 +343,7 @@ def add_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/aut return call_remote_broker_agent(username, mode='addauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ], remote_agent=remote_agent) -def delete_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/authorized_keys', query_mode='LOCAL', remote_agent=None, delay_deletion=0): +def delete_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/authorized_keys', query_mode='LOCAL', remote_agent=None, delay_deletion=0, **kwargs): """\ Remove a public key hash from the user's authorized_keys file. @@ -373,7 +375,7 @@ def delete_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/ return call_remote_broker_agent(username, mode='delauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ], remote_agent=remote_agent) -def get_servers(username, query_mode='LOCAL', remote_agent=None): +def get_servers(username, query_mode='LOCAL', remote_agent=None, **kwargs): """\ Query X2Go Broker Agent for the list of currently used servers. @@ -433,3 +435,9 @@ def genkeypair(local_username, client_address, key_type='RSA'): privkey = privkey_obj.getvalue() return (pubkey, privkey) + +tasks_available = { + 'PING': ping, + 'PING_ICMP': ping_icmp, + 'LISTSESSIONS': list_sessions, +} 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

← Newer
1
...
11
12
13
14
15
16
17
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits November 2013