[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-70-g006c44f

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@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@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).