x2go-commits September 2013

x2go-commits@lists.x2go.org

2 participants
2415 discussions

x2gobroker.git - master (branch) updated: 0.0.2.3-31-g02413b4
by git-admin＠x2go.org 25 Sep '13

25 Sep '13

The branch, master has been updated via 02413b4ef4e3b0441715a298b9c23974489b677e (commit) from b002295e8bf2023d7c97ce990f4c42514eb56cbd (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 02413b4ef4e3b0441715a298b9c23974489b677e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 25 11:58:34 2013 +0200 fine-tune session profile based agent-query-mode ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 70242d2..66698ab 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -472,6 +472,7 @@ class X2GoBroker(object): """ _default_agent_query_mode = "LOCAL" + _backend_agent_query_mode = "" _agent_query_mode = "" if _profile and _profile.has_key(u'broker-agent-query-mode') and _profile['broker-agent-query-mode']: @@ -479,14 +480,14 @@ class X2GoBroker(object): logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): found broker-agent-query-mode in session profile with ID {id}: {value}. This one has precendence over the default and the backend value.'.format(id=profile_id, value=_authorized_keys_file)) elif self.config.has_value(self.backend_name, 'agent-query-mode') and self.config.get_value(self.backend_name, 'agent-query-mode'): - _agent_query_mode = self.config.get_value(self.backend_name, 'agent-query-mode').lower() + _backend_agent_query_mode = self.config.get_value(self.backend_name, 'agent-query-mode').lower() logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): found agent-query-mode in backend config section »{backend}«: {value}. This one has precendence over the default value.'.format(backend=self.backend_name, value=_agent_query_mode)) - elif self.config.has_value('global', 'default-agent-query-mode'): + elif self.config.has_value('global', 'default-agent-query-mode') and self.config.get_value('global', 'default-agent-query-mode'): _default_agent_query_mode = self.config.get_value('global', 'default-agent-query-mode').lower() logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): found default-agent-query-mode in global config section: {value}'.format(value=_default_agent_query_mode)) - return unicode(_agent_query_mode) or unicode(_default_agent_query_mode) + return unicode(_agent_query_mode) or unicode(_backend_agent_query_mode) unicode(_default_agent_query_mode) def use_session_autologin(self, profile_id): """\ 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-28-g50413fd
by git-admin＠x2go.org 25 Sep '13

25 Sep '13

The branch, master has been updated via 50413fda70a8ec4b0663f87b1e14c5c39bb8efdf (commit) from 39b88526208c985c15e53703372223ebe09e6ff1 (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 50413fda70a8ec4b0663f87b1e14c5c39bb8efdf Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 25 11:09:16 2013 +0200 Modify default x2gobroker-sessionprofiles.conf and provide something that will works with every default setup. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + etc/broker/x2gobroker-sessionprofiles.conf | 84 ++++++++++++++++------------ 2 files changed, 50 insertions(+), 36 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 37e0d60..55644d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - Provide empty directory /etc/x2go/broker/ssl. - Re-order x2gobroker main file. Move logging further to the back to allow taking command-line options into account. + - Modify default x2gobroker-sessionprofiles.conf and provide something + that will works with every default setup. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf index c45060d..a2faac9 100644 --- a/etc/broker/x2gobroker-sessionprofiles.conf +++ b/etc/broker/x2gobroker-sessionprofiles.conf @@ -62,6 +62,18 @@ setdpi=0 pack=16m-jpeg directrdp=false +[localhost-kde] +name=KDE - localhost +user= +hostname=localhost +command=KDE + +[localhost-mate] +name=MATE - localhost +user= +hostname=localhost +command=MATE + ### EXAMPLES: Below you find some config examples. Adapt them to your needs or ### simply write your own session profiles and remove the examples below. @@ -84,42 +96,42 @@ directrdp=false ## session profiles will be shown in X2Go Client. ## -[pool-A-server-A] -user= -host=server-a.pool-a.domain.local -name=GNOME - pool-A (srv-A) -command=GNOME -rootless=false -acl-groups-allow=gnome-users,admins -acl-groups-deny=ALL -acl-clients-deny=ALL -acl-clients-allow=10.1.0.0/16 -acl-any-order=deny-allow -broker-session-autologin=true - -[pool-A-server-B] -user= -host=server-b.pool-a.domain.local -name=GNOME - pool-A (srv-B) -command=GNOME -rootless=false -acl-groups-allow=gnome-users,admins -acl-groups-deny=ALL -acl-clients-deny=ALL -acl-clients-allow=10.2.0.0/16 -acl-any-order=deny-allow -broker-session-autologin=true - -[pool-A-server-C] -user= -host=server-c.pool-a.domain.local -name=KDE - pool-A (srv-C) -command=KDE -rootless=false -acl-groups-allow=kde-users,admins -acl-groups-deny=ALL -acl-any-order=deny-allow -broker-session-autologin=true +#[pool-A-server-A] +#user= +#host=server-a.pool-a.domain.local +#name=GNOME - pool-A (srv-A) +#command=GNOME +#rootless=false +#acl-groups-allow=gnome-users,admins +#acl-groups-deny=ALL +#acl-clients-deny=ALL +#acl-clients-allow=10.1.0.0/16 +#acl-any-order=deny-allow +#broker-session-autologin=true + +#[pool-A-server-B] +#user= +#host=server-b.pool-a.domain.local +#name=GNOME - pool-A (srv-B) +#command=GNOME +#rootless=false +#acl-groups-allow=gnome-users,admins +#acl-groups-deny=ALL +#acl-clients-deny=ALL +#acl-clients-allow=10.2.0.0/16 +#acl-any-order=deny-allow +#broker-session-autologin=true + +#[pool-A-server-C] +#user= +#host=server-c.pool-a.domain.local +#name=KDE - pool-A (srv-C) +#command=KDE +#rootless=false +#acl-groups-allow=kde-users,admins +#acl-groups-deny=ALL +#acl-any-order=deny-allow +#broker-session-autologin=true ## ## EXAMPLE: pool-B (e.g. webserver in the DMZ or on the internet) 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-29-g973b9ac
by git-admin＠x2go.org 25 Sep '13

25 Sep '13

The branch, master has been updated via 973b9ace780d34bc97a2f6b9e5d2d618f9a41ad4 (commit) from 50413fda70a8ec4b0663f87b1e14c5c39bb8efdf (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 973b9ace780d34bc97a2f6b9e5d2d618f9a41ad4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 25 11:09:42 2013 +0200 typo ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 55644d3..047e26b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,7 +18,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - Re-order x2gobroker main file. Move logging further to the back to allow taking command-line options into account. - Modify default x2gobroker-sessionprofiles.conf and provide something - that will works with every default setup. + that will work with every default setup. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: 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-30-gb002295
by git-admin＠x2go.org 25 Sep '13

25 Sep '13

The branch, master has been updated via b002295e8bf2023d7c97ce990f4c42514eb56cbd (commit) from 973b9ace780d34bc97a2f6b9e5d2d618f9a41ad4 (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 b002295e8bf2023d7c97ce990f4c42514eb56cbd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 25 11:16:34 2013 +0200 New broker session profile parameter: broker-agent-query-mode. Define agent query methods per session profile. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2gobroker/brokers/base_broker.py | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 047e26b..26a2140 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low allow taking command-line options into account. - Modify default x2gobroker-sessionprofiles.conf and provide something that will work with every default setup. + - New broker session profile parameter: broker-agent-query-mode. Define + agent query methods per session profile. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 5d4ada9..70242d2 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -473,7 +473,12 @@ class X2GoBroker(object): """ _default_agent_query_mode = "LOCAL" _agent_query_mode = "" - if self.config.has_value(self.backend_name, 'agent-query-mode') and self.config.get_value(self.backend_name, 'agent-query-mode'): + + if _profile and _profile.has_key(u'broker-agent-query-mode') and _profile['broker-agent-query-mode']: + _agent_query_mode = _profile[u'broker-agent-query-mode'] + logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): found broker-agent-query-mode in session profile with ID {id}: {value}. This one has precendence over the default and the backend value.'.format(id=profile_id, value=_authorized_keys_file)) + + elif self.config.has_value(self.backend_name, 'agent-query-mode') and self.config.get_value(self.backend_name, 'agent-query-mode'): _agent_query_mode = self.config.get_value(self.backend_name, 'agent-query-mode').lower() logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): found agent-query-mode in backend config section »{backend}«: {value}. This one has precendence over the default value.'.format(backend=self.backend_name, value=_agent_query_mode)) 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

page changed: wiki:development:build-howto-mswin:pyhoca-gui
by wiki-admin＠x2go.org 25 Sep '13

25 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/25 08:18 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 IP-Address : 134.245.254.47 Hostname : m-047.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:pyhoca-gui… New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:pyhoca-gui Edit Summary: [Choosing the PyHoca-GUI Version] User : sunweaver @@ -92,9 +92,9 @@ As the development of PyHoca-GUI is closely entangled with the development of Python X2Go, for bleeding edge code it is recommended to use the master branches of both projects. <code bash> $ cd python-x2go && git checkout master && cd - - $ cd python-x2go && python setup.py install_lib && python setup.py install + $ cd python-x2go && python setup.py install_lib && python setup.py install && cd - $ cd pyhoca-gui && git checkout master && cd - </code> -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:development:build-howto-mswin:pyhoca-gui
by wiki-admin＠x2go.org 25 Sep '13

25 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/25 08:18 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 IP-Address : 134.245.254.47 Hostname : m-047.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:pyhoca-gui… New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:pyhoca-gui Edit Summary: [Installing Python X2Go] User : sunweaver @@ -65,9 +65,9 @@ Then make sure that Python X2Go is properly installed in a non-egg'ish way: <code bash> - $ cd python-x2go && python setup.py install && cd - + $ cd python-x2go && python setup.py install_lib && python setup.py install && cd - </code> If you want to install a special version of Python X2Go, use '''git checkout'' to get a specific version: -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:development:build-howto-mswin:pyhoca-gui
by wiki-admin＠x2go.org 25 Sep '13

25 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/25 08:17 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 IP-Address : 134.245.254.47 Hostname : m-047.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:pyhoca-gui… New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:pyhoca-gui Edit Summary: [Choosing the PyHoca-GUI Version] User : sunweaver @@ -78,15 +78,25 @@ A list of available versions can be listed with ''git tag'' executed in the ''python-x2go'' directory. ==== Choosing the PyHoca-GUI Version ==== - Before testing/building PyHoca-GUI, you may want to choose the version of PyHoca-GUI to use, use '''git checkout'' to get a specific version: + Before testing/building PyHoca-GUI, you may want to choose the version of PyHoca-GUI to use, use ''git checkout'' to get a specific version: <code bash> $ cd pyhoca-gui && git checkout <the-version-you-want> && cd - </code> A list of available versions can be listed with ''git tag'' executed in the ''pyhoca-gui'' directory. + + If you want to test/build bleeding edge code, build PyHoca-GUI from the master branch. + + As the development of PyHoca-GUI is closely entangled with the development of Python X2Go, for bleeding edge code it is recommended to use the master branches of both projects. + + <code bash> + $ cd python-x2go && git checkout master && cd - + $ cd python-x2go && python setup.py install_lib && python setup.py install + $ cd pyhoca-gui && git checkout master && cd - + </code> ==== Launching PyHoca-GUI from the Cmdline ==== -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:development:build-howto-mswin:pyhoca-gui
by wiki-admin＠x2go.org 25 Sep '13

25 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/25 07:58 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 IP-Address : 134.245.254.47 Hostname : m-047.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:pyhoca-gui… New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:pyhoca-gui Edit Summary: [Installing Python X2Go] User : sunweaver @@ -68,9 +68,9 @@ <code bash> $ cd python-x2go && python setup.py install && cd - </code> - If you want to install a special version of Python X2Go, use '''git-checkout'' to get a specific version: + If you want to install a special version of Python X2Go, use '''git checkout'' to get a specific version: <code bash> $ cd python-x2go && git checkout <the-version-you-want> && cd - </code> -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:development:build-howto-mswin:pyhoca-gui
by wiki-admin＠x2go.org 25 Sep '13

25 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/25 07:58 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 IP-Address : 134.245.254.47 Hostname : m-047.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:pyhoca-gui… New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:pyhoca-gui Edit Summary: User : sunweaver @@ -75,8 +75,19 @@ $ cd python-x2go && git checkout <the-version-you-want> && cd - </code> A list of available versions can be listed with ''git tag'' executed in the ''python-x2go'' directory. + + ==== Choosing the PyHoca-GUI Version ==== + + Before testing/building PyHoca-GUI, you may want to choose the version of PyHoca-GUI to use, use '''git checkout'' to get a specific version: + + <code bash> + $ cd pyhoca-gui && git checkout <the-version-you-want> && cd - + </code> + + A list of available versions can be listed with ''git tag'' executed in the ''pyhoca-gui'' directory. + ==== Launching PyHoca-GUI from the Cmdline ==== A test launch of PyHoca-GUI can now be done with this command: -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:development:build-howto-mswin:pyhoca-gui
by wiki-admin＠x2go.org 25 Sep '13

25 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/25 07:55 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 IP-Address : 134.245.254.47 Hostname : m-047.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:pyhoca-gui… New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:pyhoca-gui Edit Summary: [Launching PyHoca-GUI from the Cmdline] User : sunweaver @@ -85,9 +85,9 @@ $ cd pyhoca-gui $ ./pyhoca-gui --start-xserver --lang=<your-lang-shortcut> </code> - (... where <your-lang-shortcut> can be de, nl, dk, etc.). If the ''--lang'' parameter is omitted, the application will run in English. + (... where <your-lang-shortcut> can be de, nl, da, etc.). If the ''--lang'' parameter is omitted, the application will run in English. ===== Building the Windows Installer Setup ===== To build a MS Windows Installer (32-bit) of PyHoca-GUI, run the following command: -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

← Newer
1
2
3
4
5
6
7
...
242
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2013