x2go-commits November 2013

x2go-commits@lists.x2go.org

2 participants
391 discussions

cups-x2go.git - master (branch) updated: 3.0.0.4-6-gfd3a025
by git-admin＠x2go.org 27 Nov '13

27 Nov '13

The branch, master has been updated via fd3a025df1ccc4a179cebd81bdb7124bee58fccc (commit) from 6386f1914bdd78b75e20b20757bfec872c0f29d4 (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 fd3a025df1ccc4a179cebd81bdb7124bee58fccc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 27 14:51:56 2013 +0100 debian/source/format: Switch to format 1.0. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/source/format | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0feb9ca..167b508 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ cups-x2go (3.0.1.0-0~x2go1) UNRELEASED; urgency=low - Add license file. (Fixes: #298). - Add a short README that provides some getting started information. (Fixes: #299). + * debian/source/format: + + Switch to format 1.0. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Nov 2012 17:10:22 +0100 diff --git a/debian/source/format b/debian/source/format index 435dd71..9f8e9b6 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1,2 +1 @@ -3.0 (native) - +1.0 \ No newline at end of file hooks/post-receive -- cups-x2go.git (CUPS Backend for X2Go Printing) 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 "cups-x2go.git" (CUPS Backend for X2Go Printing).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-246-g91f1261
by git-admin＠x2go.org 27 Nov '13

27 Nov '13

The branch, master has been updated via 91f12618d7360238163784ee1b948b4af264c7be (commit) from bc4e7e10f29be951121d0546eb5c9b39a7ab5803 (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 91f12618d7360238163784ee1b948b4af264c7be Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 27 14:46:13 2013 +0100 test-wise switch to source/format 1.0 (latest dpkg won't allow 3.0 (native) with -0 as revision) ----------------------------------------------------------------------- Summary of changes: debian/source/format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: 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 -- 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

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

27 Nov '13

The branch, release/4.0.1.x has been updated via 86bbc0209c99902125bbd8ab8a9e14505b64389f (commit) from 3a5777aac81526f9462070ead36bdf23734a77df (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 86bbc0209c99902125bbd8ab8a9e14505b64389f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 27 14:46:13 2013 +0100 test-wise switch to source/format 1.0 (latest dpkg won't allow 3.0 (native) with -0 as revision) ----------------------------------------------------------------------- Summary of changes: debian/source/format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: 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 -- 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

python-x2go.git - master (branch) updated: 0.4.0.8-23-g696f1b0
by git-admin＠x2go.org 27 Nov '13

27 Nov '13

The branch, master has been updated via 696f1b0a0c3a0f66f4c8a1bcec3211e7c9792f47 (commit) from 596f0cb06a0c2f1e2f4f0f56826612e208521daf (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 696f1b0a0c3a0f66f4c8a1bcec3211e7c9792f47 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 27 14:28:34 2013 +0100 Check for pulse cookie file in old (~/.pulse-cookie) and new (~/.config/pulse/cookie) location. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/terminal/_stdout.py | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0857e1f..a7f79ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low - Report about found session window / session window retitling in debug mode. - Fix session window detection when local session manager is the i3 session manager (which uses _NET_CLIENT_LIST_STACKING instead of _NET_CLIENT_LIST). + - Check for pulse cookie file in old (~/.pulse-cookie) and new + (~/.config/pulse/cookie) location. [ Orion Poplawski ] * debian/control: diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 9d06ccd..b602341 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -529,13 +529,18 @@ class X2GoTerminalSessionSTDOUT(object): ### ### PULSEAUDIO ### + cookie_filepath = None if os.path.exists(os.path.normpath('%s/.pulse-cookie' % _LOCAL_HOME)): + cookie_filepath = os.path.normpath('%s/.pulse-cookie' % _LOCAL_HOME) + elif os.path.exists(os.path.normpath('%s/.config/pulse/cookie' % _LOCAL_HOME)): + cookie_filepath = os.path.normpath('%s/.config/pulse/cookie' % _LOCAL_HOME) + if cookie_filepath is not None: # setup pulse client config file on X2Go server cmd_line = "echo 'default-server=127.0.0.1:%s'>%s/.pulse-client.conf;" % (self.session_info.snd_port, self.session_info.remote_container) + \ "echo 'cookie-file=%s/.pulse-cookie'>>%s/.pulse-client.conf" % (self.session_info.remote_container, self.session_info.remote_container) (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line) - self.control_session._x2go_sftp_put(local_path='%s/.pulse-cookie' % _LOCAL_HOME, remote_path='%s/.pulse-cookie' % self.session_info.remote_container) + self.control_session._x2go_sftp_put(local_path=cookie_filepath, remote_path='%s/.pulse-cookie' % self.session_info.remote_container) # start reverse SSH tunnel for pulse stream _tunnel = rforward.X2GoRevFwTunnel(server_port=self.session_info.snd_port, hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

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

27 Nov '13

The branch, master has been updated via 2cbf163320a11a5f832bfe6b8f201a1616d89496 (commit) from 21bd075b993702a0ced5271889202b2eb0d32291 (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 2cbf163320a11a5f832bfe6b8f201a1616d89496 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 27 11:12:45 2013 +0100 use expandHome(...) for more cmd line options ----------------------------------------------------------------------- Summary of changes: onmainwindow.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 53817c2..4677134 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -6626,12 +6626,12 @@ bool ONMainWindow::parseParameter ( QString param ) } if ( setting == "--broker-cacertfile") { - config.brokerCaCertFile=value; + config.brokerCaCertFile=expandHome(value); return true; } if ( setting == "--broker-ssh-key") { - config.brokerSshKey=value; + config.brokerSshKey=expandHome(value); return true; } if ( setting == "--ssh-key") @@ -6642,15 +6642,15 @@ bool ONMainWindow::parseParameter ( QString param ) switch(parts.length()) { case 1: - key.key=parts[0]; + key.key=expandHome(parts[0]); break; case 2: - key.key=parts[1]; + key.key=expandHome(parts[1]); authPart=parts[0]; break; case 3: authPart=parts[0]; - key.key=parts[2]; + key.key=expandHome(parts[2]); key.port=parts[1]; break; } @@ -6691,6 +6691,7 @@ bool ONMainWindow::parseParameter ( QString param ) } if (setting == "--support-menu") { + value = expandHome(value) if (! QFile::exists(value)) { printError( param + tr(" (file not exists)")); @@ -6701,6 +6702,7 @@ bool ONMainWindow::parseParameter ( QString param ) } if (setting == "--background") { + value = expandHome(value) if (! QFile::exists(value)) { printError( param + tr(" (file not exists)")); 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-68-gb460374
by git-admin＠x2go.org 27 Nov '13

27 Nov '13

The branch, master has been updated via b4603743e414a6fea2a82ee919955f4d7c7a797f (commit) from 2f417f45d0a10f7467724d473601a90487b7160b (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 b4603743e414a6fea2a82ee919955f4d7c7a797f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 27 10:54:23 2013 +0100 improve last commit ----------------------------------------------------------------------- Summary of changes: x2gobroker/basicauth.py | 5 ++--- x2gobroker/web/uccs.py | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2gobroker/basicauth.py b/x2gobroker/basicauth.py index c621817..a236053 100644 --- a/x2gobroker/basicauth.py +++ b/x2gobroker/basicauth.py @@ -34,10 +34,9 @@ def require_basic_auth(realm, validate_callback): handler._transforms = [] handler.finish() - dummy, access = validate_callback('check-credentials', 'FALSE') + kwargs['basicauth_user'], access = validate_callback('check-credentials', 'FALSE') if access: - kwargs['basicauth_user'] = 'anonymous' - kwargs['basicauth_pass'] = 'access granted' + kwargs['basicauth_pass'] = 'anonymous access granted' return True auth_header = handler.request.headers.get('Authorization') diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py index b2a17d0..b2bd842 100644 --- a/x2gobroker/web/uccs.py +++ b/x2gobroker/web/uccs.py @@ -47,6 +47,8 @@ def credentials_validate(username, password): if not access and "@" in username: username = username.split('@')[0] access = broker.check_access(username=username, password=password) + if username == 'check-credentials' and password == 'FALSE': + username = 'anonymous' return username, access 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-27-g21bd075
by git-admin＠x2go.org 27 Nov '13

27 Nov '13

The branch, master has been updated via 21bd075b993702a0ced5271889202b2eb0d32291 (commit) from 008eb5cf4a09e1404efb4bd92218028dd48fe75c (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 21bd075b993702a0ced5271889202b2eb0d32291 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 27 10:02:13 2013 +0100 Syntax fix of x2goclient.desktop file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + desktop/x2goclient.desktop | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f4ddb5a..12f6ae2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ x2goclient (4.0.1.2-0~x2go2) UNRELEASED; urgency=low attention by Eldamir on IRC. Thanks!). - Expand tilde operator for all other file paths handed over to X2Go Client via sessions file or cmdline parameter. + - Syntax fix of x2goclient.desktop file. * Pull-in packaging changes from Debian. [ Ricardo Díaz Martín ] diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop index ef3f299..fbb396d 100644 --- a/desktop/x2goclient.desktop +++ b/desktop/x2goclient.desktop @@ -10,4 +10,4 @@ X-HildonDesk-ShowInToolbar=true X-Osso-Type=application/x-executable Terminal=false Categories=Qt;KDE;Network; -Keywords=Terminal,Client,Remote,Desktop,Published,Applications,Session,Profile +Keywords=Terminal,Client,Remote,Desktop,Published,Applications,Session,Profile; 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-67-g2f417f4
by git-admin＠x2go.org 27 Nov '13

27 Nov '13

The branch, master has been updated via 2f417f45d0a10f7467724d473601a90487b7160b (commit) from 36ba0ef2fd1f7ad8d7deb27865b4cb3f0db56327 (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 2f417f45d0a10f7467724d473601a90487b7160b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 27 09:51:15 2013 +0100 Fix check-credentials = false for UCCS web frontend. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2gobroker/basicauth.py | 10 ++++++++++ x2gobroker/brokers/base_broker.py | 3 +++ 3 files changed, 14 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 34c496c..61c0dc3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - Ship python2.6 asyncore patch (Debian squeeze python2.6 version) in 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: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Recommend apache2 and libapache2-mod-wsgi for x2gobroker-wsgi. diff --git a/x2gobroker/basicauth.py b/x2gobroker/basicauth.py index ed53f31..c621817 100644 --- a/x2gobroker/basicauth.py +++ b/x2gobroker/basicauth.py @@ -27,12 +27,19 @@ def require_basic_auth(realm, validate_callback): def require_basic_auth_decorator(handler_class): def wrap_execute(handler_execute): def require_basic_auth(handler, kwargs): + def create_auth_header(): handler.set_status(401) handler.set_header('WWW-Authenticate', 'Basic realm="{realm}"'.format(realm=realm)) handler._transforms = [] handler.finish() + dummy, access = validate_callback('check-credentials', 'FALSE') + if access: + kwargs['basicauth_user'] = 'anonymous' + kwargs['basicauth_pass'] = 'access granted' + return True + auth_header = handler.request.headers.get('Authorization') if auth_header is None or not auth_header.startswith('Basic '): create_auth_header() @@ -44,12 +51,15 @@ def require_basic_auth(realm, validate_callback): return True else: create_auth_header() + def _execute(self, transforms, *args, **kwargs): if not require_basic_auth(self, kwargs): return False return handler_execute(self, transforms, *args, **kwargs) + return _execute handler_class._execute = wrap_execute(handler_class._execute) return handler_class + return require_basic_auth_decorator diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 6db07ed..1a9664a 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -740,6 +740,9 @@ class X2GoBroker(object): if not self.config.get_value('global', 'check-credentials'): logger_broker.debug('base_broker.X2GoBroker.check_access(): access is granted without checking credentials, prevent this in {configfile}'.format(configfile=self.config_file)) return True + elif username == 'check-credentials' and password == 'FALSE': + # this catches a validation check from the UCCS web frontend... + return False ### IMPLEMENT YOUR AUTHENTICATION LOGIC IN THE self._do_authenticate(**kwargs) METHOD ### when inheriting from the base.X2GoBroker class. 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-66-g36ba0ef
by git-admin＠x2go.org 27 Nov '13

27 Nov '13

The branch, master has been updated via 36ba0ef2fd1f7ad8d7deb27865b4cb3f0db56327 (commit) from 86c1afab1e0b1e3d200b72f39964603ecb810de4 (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 36ba0ef2fd1f7ad8d7deb27865b4cb3f0db56327 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Nov 21 09:10:42 2013 +0100 Show correct environment variables in log file prelude when WSGI is used. ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 30 ++++++++++++++++++------------ debian/changelog | 1 + 2 files changed, 19 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index e37a5ee..2a1f319 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -49,6 +49,19 @@ def prep_http_mode(): } +def logfile_prelude(): + 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)) + logger_broker.info(' X2GOBROKER_AGENT_CMD: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_AGENT_CMD)) + logger_broker.info(' X2GOBROKER_AUTHSERVICE_SOCKET: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_AUTHSERVICE_SOCKET)) + logger_broker.info(' X2GOBROKER_DEFAULT_BACKEND: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND)) + logger_broker.info(' X2GOBROKER_SSL_CERTFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE)) + logger_broker.info(' X2GOBROKER_SSL_KEYFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE)) + + try: import x2gobroker.defaults except ImportError: @@ -131,7 +144,8 @@ if __name__ == "__main__": if interactive_mode_warning: logger_broker.warn('X2Go Session Broker has been started interactively by user {username},'.format(username=x2gobroker.defaults.X2GOBROKER_USER)) logger_broker.warn(' better run as user {daemon_username}.'.format(daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) - logger_broker.info('Automatically switching to DEBUG mode due to interactive launch of this application.') + logger_broker.warn('Automatically switching to DEBUG mode due to interactive launch of this application.') + x2gobroker.defaults.X2GOBROKER_DEBUG = True if cmdline_args.bind is None: cmdline_args.bind = '127.0.0.1:8080' if cmdline_args.user: logger_broker.warn('ignoring non-valid option --user for broker mode HTTP...') if cmdline_args.auth_cookie: logger_broker.warn('ignoring non-valid option --auth-cookie for broker mode HTTP...') @@ -158,20 +172,11 @@ 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}),'.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)) -logger_broker.info(' X2GOBROKER_AGENT_CMD: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_AGENT_CMD)) -logger_broker.info(' X2GOBROKER_AUTHSERVICE_SOCKET: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_AUTHSERVICE_SOCKET)) -logger_broker.info(' X2GOBROKER_DEFAULT_BACKEND: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND)) -logger_broker.info(' X2GOBROKER_SSL_CERTFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE)) -logger_broker.info(' X2GOBROKER_SSL_KEYFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE)) - # run the Python Tornado standalone daemon or handle interactive command line execution (via SSH) if __name__ == "__main__": + logfile_prelude() + if cmdline_args.mode.upper() == 'HTTP': ### launch as standalone HTTP daemon ### @@ -232,6 +237,7 @@ else: if key.startswith('X2GOBROKER_'): os.environ.update({ key: environ[key] }) reload(x2gobroker.defaults) + logfile_prelude() return _tornado_application(environ, start_response) diff --git a/debian/changelog b/debian/changelog index c78385c..34c496c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low password is not provided or wrong. - Ship python2.6 asyncore patch (Debian squeeze python2.6 version) in python-x2gobroker's docs folder. + - Show correct environment variables in log file prelude when WSGI is used. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Recommend apache2 and libapache2-mod-wsgi for x2gobroker-wsgi. 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

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.8-4-g3a5777a
by git-admin＠x2go.org 26 Nov '13

26 Nov '13

The branch, release/4.0.1.x has been updated via 3a5777aac81526f9462070ead36bdf23734a77df (commit) from 3feefc6bc32c28e6f8143b7950ee0a96f1cc4ec3 (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 3a5777aac81526f9462070ead36bdf23734a77df Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 26 19:41:30 2013 +0100 increment version files ----------------------------------------------------------------------- Summary of changes: x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 1373c30..07a4565 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -4.0.1.6 +4.0.1.9 diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 1373c30..07a4565 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -4.0.1.6 +4.0.1.9 diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index 1373c30..07a4565 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -4.0.1.6 +4.0.1.9 diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 1373c30..07a4565 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -4.0.1.6 +4.0.1.9 diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index 1373c30..07a4565 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -4.0.1.6 +4.0.1.9 diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index 1373c30..07a4565 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -4.0.1.6 +4.0.1.9 diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 1373c30..07a4565 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -4.0.1.6 +4.0.1.9 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

← Newer
1
...
13
14
15
16
17
18
19
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits November 2013