x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

python-x2go.git - master (branch) updated: 0.4.0.0-3-g9375394
by git-admin＠x2go.org 13 Feb '13

13 Feb '13

The branch, master has been updated via 937539415120c32ba970c0ec9e4bc7e9f6861f68 (commit) from a73faa46649f99b8cb1703c29706134a90ece31e (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 937539415120c32ba970c0ec9e4bc7e9f6861f68 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 13 12:36:42 2013 +0100 Documentation fix and typo fix relevant for win32 build. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- x2go/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 794f845..7399ad6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -python-x2go (0.4.0.1-0~x2go2) UNRELEASED; urgency=low +python-x2go (0.4.0.1-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * Documentation fix and typo fix relevant for win32 build. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 12 Feb 2013 08:55:31 +0100 diff --git a/x2go/__init__.py b/x2go/__init__.py index 5b3b14b..926a338 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -220,5 +220,5 @@ X2goSession = X2GoSession X2goSSHProxy = X2GoSSHProxy if X2GOCLIENT_OS == 'Windows': - X2goClientXConfig = X2GoClientXconfig + X2goClientXConfig = X2GoClientXConfig X2goXServer = X2GoXServer 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

pyhoca-gui.git - master (branch) updated: 0.4.0.0-3-gf6a4c0a
by git-admin＠x2go.org 13 Feb '13

13 Feb '13

The branch, master has been updated via f6a4c0af7740b348ea34d2e4d091940c4302c93f (commit) from 440c0c8b9587707e85c87f1cd606d2feeba84260 (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 f6a4c0af7740b348ea34d2e4d091940c4302c93f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 13 05:57:06 2013 +0100 fix glob arg for image installation paths ----------------------------------------------------------------------- Summary of changes: setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/setup.py b/setup.py index 34ec22d..eabb468 100755 --- a/setup.py +++ b/setup.py @@ -173,7 +173,7 @@ elif platform.system() == 'Linux': ) icon_files = datafilelist('{prefix}/share/icons/PyHoca'.format(prefix=sys.prefix), r'icons_symlinked/PyHoca') - img_files = [("{prefix}/share/pyhoca/img".format(prefix=sys.prefix), glob(r'img\\*.*'))] + img_files = [("{prefix}/share/pyhoca/img".format(prefix=sys.prefix), glob('img/*.*'))] desktop_files = [ ('{prefix}/share/applications'.format(prefix=sys.prefix), glob('desktop/*')), ('{prefix}/share/pixmaps'.format(prefix=sys.prefix), glob('pixmaps/*.svg')), hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

x2gobroker.git - build-main (branch) created: 0.0.0.1
by git-admin＠x2go.org 12 Feb '13

12 Feb '13

The branch, build-main has been created at 6d343a60b4adb1041ba8cbef1839e8fd9ec09642 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- 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: 6d343a60b4adb1041ba8cbef1839e8fd9ec09642
by git-admin＠x2go.org 12 Feb '13

12 Feb '13

The branch, master has been updated via 6d343a60b4adb1041ba8cbef1839e8fd9ec09642 (commit) from 7dfbf692abd457506ebf3f1372b8d0a11f3c9767 (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 6d343a60b4adb1041ba8cbef1839e8fd9ec09642 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 12 22:52:25 2013 +0100 release 0.0.0.1 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +-- debian/control | 94 +++++++++++++++++++++++++++--------------------------- 2 files changed, 49 insertions(+), 49 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f99aeb6..e040920 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -x2gobroker (0.0.0.1-0~x2go1) UNRELEASED; urgency=low +x2gobroker (0.0.0.1-0~x2go1) unstable; urgency=low * Initial upstream version. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 15 Sep 2012 17:30:24 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 12 Feb 2013 22:51:12 +0100 diff --git a/debian/control b/debian/control index 3b222bc..2789bf7 100644 --- a/debian/control +++ b/debian/control @@ -138,50 +138,50 @@ Description: X2Go http(s) based session broker (Python modules) This package contains common files needed by all X2Go session brokers being package for this distribution. -Package: x2gobroker-agent -Architecture: any -Depends: - ${shlibs:Depends}, - ${misc:Depends}, - perl, - adduser, - x2goserver, -Description: X2Go http(s) based session broker (common files) - X2Go is a server based computing environment with - - session resuming - - low bandwidth support - - LDAP support - - client side mass storage mounting support - - client side printing support - - audio support - - authentication by smartcard and USB stick - . - The session broker is a server tool for X2Go that - tells your X2Go Client application in a terminal - server cluster what servers and session types are - most appropriate for the user in front of the - X2Go terminal. - . - A session broker is most useful in load balanced - X2Go server farms. - . - This package contains a setuid agent command that - is required by the X2Go session broker. This package - has to be installed on all X2Go servers that shall get - managed via the X2Go session broker. - . - WARNING: This package installs a setuid wrapper - (/usr/lib/x2go/broker/x2gobroker-agent) on your system. - This setuid wrapper aims to be a secure replacement - for the deprecated suidperl exectuable that was removed - from Perl (>= 5.12). - . - This wrapper is only able to execute the Perl script - /usr/lib/x2go/broker/x2gobroker-agent.pl. For running - properly, x2gobroker-agent.pl needs setuid privileges. - . - If you hesitate to install this package, study the code - of the named wrapper and the named Perl script beforehand. - Note that the X2Go session broker will not work without this - x2gobroker-agent component installed on your to-be-managed - X2Go servers. +#Package: x2gobroker-agent +#Architecture: any +#Depends: +# ${shlibs:Depends}, +# ${misc:Depends}, +# perl, +# adduser, +# x2goserver, +#Description: X2Go http(s) based session broker (common files) +# X2Go is a server based computing environment with +# - session resuming +# - low bandwidth support +# - LDAP support +# - client side mass storage mounting support +# - client side printing support +# - audio support +# - authentication by smartcard and USB stick +# . +# The session broker is a server tool for X2Go that +# tells your X2Go Client application in a terminal +# server cluster what servers and session types are +# most appropriate for the user in front of the +# X2Go terminal. +# . +# A session broker is most useful in load balanced +# X2Go server farms. +# . +# This package contains a setuid agent command that +# is required by the X2Go session broker. This package +# has to be installed on all X2Go servers that shall get +# managed via the X2Go session broker. +# . +# WARNING: This package installs a setuid wrapper +# (/usr/lib/x2go/broker/x2gobroker-agent) on your system. +# This setuid wrapper aims to be a secure replacement +# for the deprecated suidperl exectuable that was removed +# from Perl (>= 5.12). +# . +# This wrapper is only able to execute the Perl script +# /usr/lib/x2go/broker/x2gobroker-agent.pl. For running +# properly, x2gobroker-agent.pl needs setuid privileges. +# . +# If you hesitate to install this package, study the code +# of the named wrapper and the named Perl script beforehand. +# Note that the X2Go session broker will not work without this +# x2gobroker-agent component installed on your to-be-managed +# X2Go servers. 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: 7dfbf692abd457506ebf3f1372b8d0a11f3c9767
by git-admin＠x2go.org 12 Feb '13

12 Feb '13

The branch, master has been updated via 7dfbf692abd457506ebf3f1372b8d0a11f3c9767 (commit) from f4ee02eef0a15e605c4ff80641470f8267b5a06e (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 7dfbf692abd457506ebf3f1372b8d0a11f3c9767 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 12 22:50:57 2013 +0100 make SSL feature available ----------------------------------------------------------------------- Summary of changes: debian/control | 1 + debian/x2gobroker-daemon.default | 8 ++++++++ debian/x2gobroker-daemon.init | 7 +++++++ sbin/x2gobroker | 8 +++++++- x2gobroker/defaults.py | 11 +++++++++++ 5 files changed, 34 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/control b/debian/control index b70e569..3b222bc 100644 --- a/debian/control +++ b/debian/control @@ -113,6 +113,7 @@ Depends: ${python:Depends}, python-pampy, python-netaddr, + python-webpy (>= 1:0.37), Suggests: apache2 | httpd, Description: X2Go http(s) based session broker (Python modules) diff --git a/debian/x2gobroker-daemon.default b/debian/x2gobroker-daemon.default index d7466e6..47ccb43 100644 --- a/debian/x2gobroker-daemon.default +++ b/debian/x2gobroker-daemon.default @@ -23,3 +23,11 @@ START_DAEMON=true # path to the X2Go Session Broker's agent command #X2GOBROKER_AGENT_CMD=/usr/lib/x2go/x2gobroker-agent + +### enable SSL, you will have to create your own SSL certificates ### + +# SSL certificate file +#X2GOBROKER_SSL_CERTFILE=/etc/x2go/broker/ssl/broker.crt + +# SSL key file (ensure permissions are set to root:x2gobroker:0640) +#X2GOBROKER_SSL_CERTFILE=/etc/x2go/broker/ssl/broker.key diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init index 2ee927a..0ee9aed 100644 --- a/debian/x2gobroker-daemon.init +++ b/debian/x2gobroker-daemon.init @@ -32,10 +32,17 @@ X2GOBROKER_DEFAULT_BACKEND="zeroconf" X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf" X2GOBROKER_AGENT_CMD="/usr/lib/x2go/x2gobroker-agent" +X2GOBROKER_SSL_CERTFILE= +X2GOBROKER_SSL_KEYFILE= test -f $DEBIANCONFIG && . $DEBIANCONFIG +export X2GOBROKER_DEBUG=0 +export X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" export X2GOBROKER_DEFAULT_BACKEND +export X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf" export X2GOBROKER_AGENT_CMD +export X2GOBROKER_SSL_CERTFILE +export X2GOBROKER_SSL_KEYFILE . /lib/lsb/init-functions diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 822f18d..5c1fdd8 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -22,9 +22,10 @@ import sys import os -import web import argparse import socket +import web +from web.wsgiserver import CherryPyWSGIServer try: import x2gobroker.defaults @@ -66,6 +67,11 @@ from x2gobroker.web.plain import * #from x2gobroker.web.json import * #from x2gobroker.web.html import * +# switch on https:// mode +if x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE and x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE: + CherryPyWSGIServer.ssl_certificate = x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE + CherryPyWSGIServer.ssl_private_key = x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE + # define the web.py URLs urls = ( '/plain/(.*)', 'X2GoBrokerWebPlain', # '/json/(.*)', 'X2GoBrokerWebJson', diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index cb1bf67..63bc254 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -51,6 +51,17 @@ if os.environ.has_key('X2GOBROKER_DEFAULT_BACKEND'): else: X2GOBROKER_DEFAULT_BACKEND="zeroconf" +if os.environ.has_key('X2GOBROKER_SSL_CERTFILE'): + X2GOBROKER_SSL_CERTFILE=os.environ['X2GOBROKER_SSL_CERTFILE'] +else: + X2GOBROKER_SSL_CERTFILE="" + +if os.environ.has_key('X2GOBROKER_SSL_KEYFILE'): + X2GOBROKER_SSL_KEYFILE=os.environ['X2GOBROKER_SSL_KEYFILE'] +else: + X2GOBROKER_SSL_KEYFILE="" + + # defaults for X2Go Sessino Broker configuration file X2GOBROKER_CONFIG_DEFAULTS = { 'global': { 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

pyhoca-gui.git - master (branch) updated: 0.4.0.0-2-g440c0c8
by git-admin＠x2go.org 12 Feb '13

12 Feb '13

The branch, master has been updated via 440c0c8b9587707e85c87f1cd606d2feeba84260 (commit) from 05b39338cc4460b2b699876c314f20b1f0a4e203 (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 440c0c8b9587707e85c87f1cd606d2feeba84260 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 12 22:18:06 2013 +0100 Fix image installation in setup.py. Thanks to Orion Poplawski for spotting. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8d034eb..2af8c3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ pyhoca-gui (0.4.0.1-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * Fix image installation in setup.py. Thanks to Orion Poplawski for spotting. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 12 Feb 2013 11:36:05 +0100 diff --git a/setup.py b/setup.py index c4d045f..34ec22d 100755 --- a/setup.py +++ b/setup.py @@ -173,7 +173,7 @@ elif platform.system() == 'Linux': ) icon_files = datafilelist('{prefix}/share/icons/PyHoca'.format(prefix=sys.prefix), r'icons_symlinked/PyHoca') - img_files = [("{prefix}/share/img".format(prefix=sys.prefix), glob(r'img\\*.*'))] + img_files = [("{prefix}/share/pyhoca/img".format(prefix=sys.prefix), glob(r'img\\*.*'))] desktop_files = [ ('{prefix}/share/applications'.format(prefix=sys.prefix), glob('desktop/*')), ('{prefix}/share/pixmaps'.format(prefix=sys.prefix), glob('pixmaps/*.svg')), hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

x2goplasmabindings.git - master (branch) updated: 3.0.1.5-2-g94546eb
by git-admin＠x2go.org 12 Feb '13

12 Feb '13

The branch, master has been updated via 94546eb6b89c2a1e62458c38b777c62b8d5afda3 (commit) from 26e21371f9af6e53e96d597c35aa2e97706e96c9 (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 94546eb6b89c2a1e62458c38b777c62b8d5afda3 Author: Frédéric Motte <frederic.motte(a)liazo.fr> Date: Tue Feb 12 21:51:50 2013 +0100 Add French translation file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ po/fr.po | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0790bf8..1f6a22d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ x2goplasmabindings (3.0.2.0-0~x2go1) UNRELEASED; urgency=low + [ Frédéric Motte ] + * New upstream version (3.0.2.0): + - Add French translation file. + + [ Mike Gabriel ] * New upstream version (3.0.2.0): - Continue development... diff --git a/po/fr.po b/po/fr.po index 7b38e4d..2849490 100644 --- a/po/fr.po +++ b/po/fr.po @@ -20,19 +20,19 @@ msgstr "" #: fsitem.cpp:36 msgid "Click to open with dolphin" -msgstr "" +msgstr "Cliquez pour ouvrir avec dolphin" #: fsitem.cpp:37 msgid "Click to eject" -msgstr "" +msgstr "Cliquez pour éjecter" #: plasmax2godialog.cpp:56 x2goplasmoid.cpp:76 msgid "X2Go Plasmoid" -msgstr "" +msgstr "X2Go Plasmoid" #: plasmax2godialog.cpp:75 msgid "Suspend session" -msgstr "" +msgstr "Suspendre la session" #: po/rc.cpp:1 rc.cpp:1 msgctxt "NAME OF TRANSLATORS" hooks/post-receive -- x2goplasmabindings.git (Plasma/KDE4 Widget 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 "x2goplasmabindings.git" (Plasma/KDE4 Widget for X2Go).

1 0

webpy.git - pristine-tar (branch) created: 346e870b48c35dc21f04d21c3b4991a8d3ffd070
by git-admin＠x2go.org 12 Feb '13

12 Feb '13

The branch, pristine-tar has been created at 346e870b48c35dc21f04d21c3b4991a8d3ffd070 (commit) - Log ----------------------------------------------------------------- commit 346e870b48c35dc21f04d21c3b4991a8d3ffd070 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 12 21:24:46 2013 +0100 pristine-tar data for webpy_0.37+20120626.orig.tar.gz ----------------------------------------------------------------------- hooks/post-receive -- webpy.git (Debian package webpy) 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 "webpy.git" (Debian package webpy).

1 0

webpy.git - upstream (branch) created: af8a06d2ef5d1faea53cbaea9e0a8df9ae19a29e
by git-admin＠x2go.org 12 Feb '13

12 Feb '13

The branch, upstream has been created at af8a06d2ef5d1faea53cbaea9e0a8df9ae19a29e (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- webpy.git (Debian package webpy) 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 "webpy.git" (Debian package webpy).

1 0

webpy.git - master (branch) created: 8c8e82c634f12c5867328dbf301cfca6b111fc6d
by git-admin＠x2go.org 12 Feb '13

12 Feb '13

The branch, master has been created at 8c8e82c634f12c5867328dbf301cfca6b111fc6d (commit) - Log ----------------------------------------------------------------- commit 8c8e82c634f12c5867328dbf301cfca6b111fc6d Author: W. Martin Borgert <debacle(a)debian.org> Date: Thu Jun 28 20:58:48 2012 +0000 Imported Debian patch 1:0.37+20120626-1 commit af8a06d2ef5d1faea53cbaea9e0a8df9ae19a29e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 12 21:24:46 2013 +0100 Imported Upstream version 0.37+20120626 ----------------------------------------------------------------------- hooks/post-receive -- webpy.git (Debian package webpy) 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 "webpy.git" (Debian package webpy).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits