x2go-commits December 2013

x2go-commits@lists.x2go.org

2 participants
2076 discussions

python-daemonize.git - master (branch) updated: 7c85d59ff7e09b0d7bf939dcaf2b18f240b07139
by git-admin＠x2go.org 19 Dec '13

19 Dec '13

The branch, master has been updated via 7c85d59ff7e09b0d7bf939dcaf2b18f240b07139 (commit) from 8632eed3bf45a20c1c5622d7a6e7487f242dd5b1 (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 7c85d59ff7e09b0d7bf939dcaf2b18f240b07139 Author: Mike Gabriel <sunweaver(a)debian.org> Date: Thu Dec 19 11:04:26 2013 +0100 Imported Debian patch 2.2.1-1 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ debian/compat | 1 + debian/control | 33 +++++++++++++++++++++++++++++++++ debian/copyright | 31 +++++++++++++++++++++++++++++++ debian/rules | 4 ++++ debian/source/format | 1 + debian/watch | 2 ++ 7 files changed, 77 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch The diff of changes is: diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..88bfbca --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +python-daemonize (2.2.1-1) unstable; urgency=low + + * Initial release. (Closes: #732603) + + -- Mike Gabriel <sunweaver(a)debian.org> Thu, 19 Dec 2013 11:04:26 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..f11c82a --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 \ No newline at end of file diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..85fbb29 --- /dev/null +++ b/debian/control @@ -0,0 +1,33 @@ +Source: python-daemonize +Section: python +Priority: optional +Maintainer: Debian Python Modules Team <python-modules-team(a)lists.alioth.debian.org> +Uploaders: + Mike Gabriel <sunweaver(a)debian.org>, +Build-Depends: + cdbs (>= 0.4.90~), + debhelper (>= 9), + python (>= 2.6.6-14~), + python-setuptools, +Standards-Version: 3.9.5 +Homepage: http://pypi.python.org/pypi/daemonize +X-Python-Version: >= 2.6 + +Package: python-daemonize +Architecture: all +Depends: + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends}, +Description: Python module for writing system daemons + The daemonize module provides a simple class (Daemonize) that + handles forking a sub-fraction of your Python script to background. + . + It takes care of: + - changing the applications directory to '/' + - setting umask 0027 for root daemons + - creating a locked PID file + - closing open file descriptors + - removing PID file on daemon exit + - handling SIGTERM signals + - logging daemon actions to /dev/log diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..097d54a --- /dev/null +++ b/debian/copyright @@ -0,0 +1,31 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: daemonize +Upstream-Contact: Ilya.otyutskiy <ilya.otyutskiy(a)icloud.com> +Source: http://pypi.python.org/pypi/daemonize + +Files: * +Copyright: 2012, Ilya.otyutskiy <ilya.otyutskiy(a)icloud.com> +License: Expat + +Files: debian/* +Copyright: 2013, Mike Gabriel <sunweaver(a)debian.org> +License: Expat + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..b466065 --- /dev/null +++ b/debian/rules @@ -0,0 +1,4 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/python-distutils.mk \ No newline at end of file diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..46ebe02 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) \ No newline at end of file diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..6001ecc --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://pypi.python.org/packages/source/d/daemonize/daemonize-(.*).tar.gz hooks/post-receive -- python-daemonize.git (python-daemonize upstream project) 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-daemonize.git" (python-daemonize upstream project).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-115-g292c637
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via 292c63786872749fd4c10ca0106d4cd1142bb327 (commit) from a0f366f95b7d6ec9f7db19aafb72bc701a2ef973 (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 292c63786872749fd4c10ca0106d4cd1142bb327 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 23:39:49 2013 +0100 x2gobroker.spec: use SOURCE1+2 as init scripts ----------------------------------------------------------------------- Summary of changes: x2gobroker.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/x2gobroker.spec b/x2gobroker.spec index 4b3ee27..90ccc30 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -224,15 +224,15 @@ install -pm0644 x2gobroker-authservice.service %{buildroot}%{_unitdir} # SysV session cleanup script %if 0%{?el5} mkdir -p %{buildroot}%{_initrddir} -install -pm0755 "init/x2gobroker-authservice.init" \ +install -pm0755 %SOURCE2 \ "$b/%_initrddir/x2gobroker-authservice" -install -pm0755 "init/x2gobroker-daemon.init" \ +install -pm0755 %SOURCE1 \ "$b/%_initrddir/x2gobroker-daemon" %else mkdir -p "$b/%_initddir" -install -pm0755 "init/x2gobroker-authservice.init" \ +install -pm0755 %SOURCE2 \ "$b/%_initddir/x2gobroker-authservice" -install -pm0755 "init/x2gobroker-daemon.init" \ +install -pm0755 %SOURCE1 \ "$b/%_initddir/x2gobroker-daemon" %endif %endif 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-114-ga0f366f
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via a0f366f95b7d6ec9f7db19aafb72bc701a2ef973 (commit) from 6be9325b9a303a3c923d4135c6385fb3ae310699 (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 a0f366f95b7d6ec9f7db19aafb72bc701a2ef973 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 23:34:25 2013 +0100 x2gobroker.spec: slightly modify x2gobroker user creation ----------------------------------------------------------------------- Summary of changes: rpm/x2gobroker-authservice.init | 2 +- x2gobroker.spec | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/rpm/x2gobroker-authservice.init b/rpm/x2gobroker-authservice.init index cfba2dc..710da2c 100644 --- a/rpm/x2gobroker-authservice.init +++ b/rpm/x2gobroker-authservice.init @@ -36,7 +36,7 @@ if ! getent passwd $X2GOBROKER_DAEMON_USER 1>/dev/null 2>/dev/null; then X2GOBROKER_DAEMON_USER=nobody fi if ! getent group $X2GOBROKER_DAEMON_GROUP 1>/dev/null 2>/dev/null; then - X2GOBROKER_DAEMON_GROUP=nogroup + X2GOBROKER_DAEMON_GROUP=nobody fi export X2GOBROKER_DEBUG diff --git a/x2gobroker.spec b/x2gobroker.spec index d64eed3..4b3ee27 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -245,9 +245,9 @@ install -pm0755 "init/x2gobroker-daemon.init" \ %endif %pre -if ! /usr/bin/getent group x2gobroker >/dev/null 2>/dev/null && /usr/sbin/groupadd -r x2gobroker; then - /usr/bin/getent passwd x2gobroker >/dev/null 2>/dev/null || \ - /usr/sbin/useradd -c "x2go broker server/user" \ +if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/groupadd -r x2gobroker; then + /usr/bin/getent passwd x2gobroker 1>/dev/null 2>/dev/null || \ + /usr/sbin/useradd -c "X2Go Broker System User" \ -d "%_localstatedir/lib/x2gobroker" \ -g x2gobroker -r -s /bin/bash x2gobroker || :; fi; @@ -314,10 +314,9 @@ fi %pre agent -if ! /usr/bin/getent group x2gobroker >/dev/null 2>/dev/null && \ - /usr/sbin/groupadd -r x2gobroker; then - /usr/bin/getent passwd x2gobroker >/dev/null 2>/dev/null || \ - /usr/sbin/useradd -c "x2go broker server/user" \ +if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/groupadd -r x2gobroker; then + /usr/bin/getent passwd x2gobroker 1>/dev/null 2>/dev/null || \ + /usr/sbin/useradd -c "X2Go Broker System User" \ -d "%_localstatedir/lib/x2gobroker" \ -g x2gobroker -r -s /bin/bash x2gobroker || :; fi; 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-111-g017051d
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via 017051d5dd79d540c9240ed7d69c6e4258ec02f7 (commit) from 547b635ac534a7ae4221b0be77c681dfed6d818a (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 017051d5dd79d540c9240ed7d69c6e4258ec02f7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 22:57:46 2013 +0100 x2gobroker.spec: python-pam -> python-pampy ----------------------------------------------------------------------- Summary of changes: x2gobroker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker.spec b/x2gobroker.spec index 9f99cd3..2d5d8dd 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -56,7 +56,7 @@ Group: Applications/Communications Requires: python2 Requires: python-argparse Requires: python-setproctitle -Requires: python-pam +Requires: python-pampy Requires: x2gobroker = %{version}-%{release} %description authservice 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-113-g6be9325
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via 6be9325b9a303a3c923d4135c6385fb3ae310699 (commit) from d9ce73f4f90b80554dea629dcf64bb1f65b65f4b (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 6be9325b9a303a3c923d4135c6385fb3ae310699 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 23:12:12 2013 +0100 x2gobroker.spec: as spec files do not know package recommendations, we will make x2gobroker-authservice a requirement ----------------------------------------------------------------------- Summary of changes: x2gobroker.spec | 2 ++ 1 file changed, 2 insertions(+) The diff of changes is: diff --git a/x2gobroker.spec b/x2gobroker.spec index 2d5d8dd..d64eed3 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -85,6 +85,7 @@ against the PAM system. Summary: X2Go Session Broker (standalone daemon) Group: Applications/Communications Requires: x2gobroker = %{version}-%{release} +Requires: x2gobroker-authservice = %{version}-%{release} %description daemon X2Go is a server based computing environment with @@ -115,6 +116,7 @@ Group: Applications/Communications Requires: x2gobroker = %{version}-%{release} Requires: httpd, mod_wsgi Requires: python2 +Requires: x2gobroker-authservice = %{version}-%{release} %description wsgi X2Go is a server based computing environment with 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-112-gd9ce73f
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via d9ce73f4f90b80554dea629dcf64bb1f65b65f4b (commit) from 017051d5dd79d540c9240ed7d69c6e4258ec02f7 (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 d9ce73f4f90b80554dea629dcf64bb1f65b65f4b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 23:10:38 2013 +0100 Make the inifile broker backend the default backend. ----------------------------------------------------------------------- Summary of changes: README | 12 ++--- TODO | 6 --- debian/changelog | 1 + defaults/python-x2gobroker.default | 2 +- doc/README.x2goclient+broker.getting-started | 57 +++++++++++++++++++++ doc/README.x2goclient+broker.zeroconf-backend | 66 ------------------------- etc/x2gobroker.conf | 4 +- init/x2gobroker-daemon.init | 2 +- man/man1/x2gobroker-testauth.1 | 2 +- rpm/x2gobroker-daemon.init | 2 +- x2gobroker/brokers/inifile_broker.py | 3 +- x2gobroker/defaults.py | 7 ++- 12 files changed, 74 insertions(+), 90 deletions(-) create mode 100644 doc/README.x2goclient+broker.getting-started delete mode 100644 doc/README.x2goclient+broker.zeroconf-backend The diff of changes is: diff --git a/README b/README index 71e43d0..a021cf5 100644 --- a/README +++ b/README @@ -8,7 +8,7 @@ Dependencies: * This version of X2Go Session Broker requires X2Go Server 4.1.0.0 and above. - * This version X2Go Session Broker works with X2Go Client + * This version of X2Go Session Broker works with X2Go Client (>= 4.0.0.0) and Python X2Go (>= 0.5.0.0, not yet available) as client. * Python modules: @@ -34,10 +34,10 @@ Available features: Available backends: - * ZEROCONF: the ,,zeroconf'' broker backend (which is the default) - is for testing X2Go client applications without much hassle - against the X2Go Session Broker - * INIFILE: the ,,inifile'' broker backend scales well with + * ZEROCONF: the ,,zeroconf'' broker backend is for testing + X2Go client applications without much hassle against the + X2Go Session Broker + * INIFILE (default): the ,,inifile'' broker backend scales well with small and medium X2Go deployments. It is configurable through a single file (/etc/x2go/broker/x2gobroker-sessionprofiles.conf). It provides flexible provisioning of session profiles based @@ -58,7 +58,7 @@ Environment variables (and their defaults): X2GOBROKER_DEBUG=false # default X2Go Session Broker backend (available: zeroconf, inifile) - X2GOBROKER_DEFAULT_BACKEND=zeroconf + X2GOBROKER_DEFAULT_BACKEND=inifile # path to the X2Go Session Broker's configuration file X2GOBROKER_CONFIG=/etc/x2go/x2gobroker.conf diff --git a/TODO b/TODO index dc1c5f9..930897c 100644 --- a/TODO +++ b/TODO @@ -11,18 +11,12 @@ Several more thinkable broker backends: For the INIFILE backend: - o implement load balancing - o implement session resuing o make use of X2Go::Server Perl API in x2gobroker-agent - o add Apache2 CGI support For the communication with Python X2Go: o add a JSON based server/client protocol -For the communication with LightDM (being a replacement of UCS): - - o add an XML based server/client protocol light+love, Mike Gabriel, 20130129 \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index b5a7a69..9dd0ee7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -66,6 +66,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Fix man pages (layout issues on x2gobroker-authservice man page). - Adapt man page installation to moval of x2gobroker(-testauth) from an sbin to a bin directory (executable for any user). + - Make the inifile broker backend the default backend. * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Fix SYNOPSIS texts. diff --git a/defaults/python-x2gobroker.default b/defaults/python-x2gobroker.default index 67b93cb..e9f0be5 100644 --- a/defaults/python-x2gobroker.default +++ b/defaults/python-x2gobroker.default @@ -23,7 +23,7 @@ #X2GOBROKER_DEBUG=0 # Default X2Go Session Broker backend (available: zeroconf, inifile) -#X2GOBROKER_DEFAULT_BACKEND=zeroconf +#X2GOBROKER_DEFAULT_BACKEND=inifile # Path to the X2Go Session Broker's configuration file #X2GOBROKER_CONFIG=/etc/x2go/x2gobroker.conf diff --git a/doc/README.x2goclient+broker.getting-started b/doc/README.x2goclient+broker.getting-started new file mode 100644 index 0000000..3457e04 --- /dev/null +++ b/doc/README.x2goclient+broker.getting-started @@ -0,0 +1,57 @@ +X2Go Client / X2Go Broker Setup +=============================== + +The easy setup for getting a first impression is this: + + +1. +Install x2goclient, x2gobroker and x2goserver(-xsession) locally + + $ sudo apt-get install x2gobroker-daemon x2gobroker-authservice + $ sudo apt-get install x2goclient + $ sudo apt-get install x2goserver-xsession + +2. +Edit the file /etc/default/x2gobroker-daemon. Enable the daemon and +if needed, adapt the bind address:port (DAEMON_BIND_ADDRESS) parameter. + +After editing, save the file and return to your terminal command line. +From here, start the daemon: + + $ invoke-rc.d x2gobroker-daemon restart + +3. +Launch x2goclient in HTTP broker mode: + + $ x2goclient --broker-url=http://127.0.0.1:8080/plain/ + +(if you have changed the bind address, use your changed value here). + +4. +The first authentication that the x2goclient asks for is an authentication +against the X2Go Broker (a HTTP server using the Tornado web framework on +default port 8080). + +As authentication backend the PAM setup of your system is used, investigate this +further by looking at this file: + + $ sudo editor /etc/pam.d/x2gobroker + +5. +If you authenticate with the broker successfully, then you get offered two +session profiles named ,,KDE - localhost'' and ,,MATE - localhost''. These +session profiles can be modified and customized in + + /etc/x2go/broker/x2gobroker-sessionprofiles.conf + +6. +If you select either of the session profiles (KDE or MATE on localhost), you +will start an X2Go session on your local machine. (Of course, either KDE or the +MATE desktop needs to be installed locally). + + + + + + + diff --git a/doc/README.x2goclient+broker.zeroconf-backend b/doc/README.x2goclient+broker.zeroconf-backend deleted file mode 100644 index c72d8b8..0000000 --- a/doc/README.x2goclient+broker.zeroconf-backend +++ /dev/null @@ -1,66 +0,0 @@ -X2Go Client / X2Go Broker Setup -=============================== - -The easy setup for getting a first impression is this: - - -1. -Install x2goclient, x2gobroker and x2goserver(-xsession) locally - - $ sudo apt-get install x2gobroker-daemon - $ sudo apt-get install x2goclient - $ sudo apt-get install x2goserver-xsession - -2. -Then edit /etc/x2go/x2gobroker.conf. The configuration file falls -into a [global] section and several [backend] sections. - -The default backend section is the [zeroconf] backend. Find that -section in the configuration file. - -Edit the 'desktop-shell' in section [zeroconf], the default is KDE. -If KDE is not installed locally, choose either of LXDE, XFCE, etc. - -Save the file again after editing. - -3. -Edit the file /etc/default/x2gobroker-daemon. Enable the daemon and -if needed, adapt the bind address:port (DAEMON_BIND_ADDRESS) parameter. - -After editing, save the file and return to your terminal command line. -From here, start the daemon: - - $ invoke-rc.d x2gobroker-daemon start - -4. -Launch x2goclient in HTTP broker mode: - - $ x2goclient --broker-url=http://127.0.0.1:8080/plain/zeroconf/ - -(if you have changed the bind address, use your changed value here). - -5. -The first authentication that the x2goclient asks for is an authentication -against the x2gobroker (a HTTP server using the web.py framework on port 8080). - -As authentication backend the PAM setup of your system is used, investigate this -further by looking at this file: - - $ sudo editor /etc/pam.d/x2gobroker - -6. -If you authenticate with the broker successfully, then you get offered one -session profile named ,,LOCALHOST''. This session profile is hard-coded into -the zeroconf backend of the X2Go Session Broker. The zeroconf backend is -for testing client functionality only and it is very minimal. - -7. -If you select the session profile LOCALHOST, you will start an X2Go session -on your local machine. - - - - - - - diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index 61e0b92..342ff50 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -195,14 +195,14 @@ # For small-scale deployments the IniFile backend is the recommended backend. [zeroconf] -#enable = true +#enable = false #auth-mech = pam #user-db = libnss #group-db = libnss #desktop-shell = KDE [inifile] -#enable = false +#enable = true #session-profiles = /etc/x2go/broker/x2gobroker-sessionprofiles.conf #[ldap] -> MUSIC OF THE FUTURE diff --git a/init/x2gobroker-daemon.init b/init/x2gobroker-daemon.init index 932c3a8..444673b 100755 --- a/init/x2gobroker-daemon.init +++ b/init/x2gobroker-daemon.init @@ -31,7 +31,7 @@ DAEMON_BIND_ADDRESS=127.0.0.1:8080 X2GOBROKER_DEBUG=0 X2GOBROKER_DAEMON_USER='x2gobroker' X2GOBROKER_DAEMON_GROUP='x2gobroker' -X2GOBROKER_DEFAULT_BACKEND="zeroconf" +X2GOBROKER_DEFAULT_BACKEND="inifile" X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf" X2GOBROKER_AGENT_CMD="/usr/lib/x2go/x2gobroker-agent" diff --git a/man/man1/x2gobroker-testauth.1 b/man/man1/x2gobroker-testauth.1 index b9f41a2..1474106 100644 --- a/man/man1/x2gobroker-testauth.1 +++ b/man/man1/x2gobroker-testauth.1 @@ -49,7 +49,7 @@ Enable debugging code. Specify an alternative configuration file name, default is: \fI/etc/x2go/x2gobroker.conf\fR. .TP \*(T<\fB\-b, \-\-backend BACKEND\fR\*(T> -Specify another configured/enabled backend configuration to test authentication against, default is: the \fIzeroconf\fR backend. +Specify another configured/enabled backend configuration to test authentication against, default is: the \fIinifile\fR backend. .SH "FILES" /etc/x2go/x2gobroker.conf, /etc/x2go/broker/* (configuration files) .PP diff --git a/rpm/x2gobroker-daemon.init b/rpm/x2gobroker-daemon.init index a6e2b48..38072ec 100644 --- a/rpm/x2gobroker-daemon.init +++ b/rpm/x2gobroker-daemon.init @@ -30,7 +30,7 @@ DAEMON_BIND_ADDRESS=127.0.0.1:8080 X2GOBROKER_DEBUG=0 X2GOBROKER_DAEMON_USER='x2gobroker' X2GOBROKER_DAEMON_GROUP='x2gobroker' -X2GOBROKER_DEFAULT_BACKEND="zeroconf" +X2GOBROKER_DEFAULT_BACKEND="inifile" X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf" X2GOBROKER_AGENT_CMD="/usr/lib/x2go/x2gobroker-agent" diff --git a/x2gobroker/brokers/inifile_broker.py b/x2gobroker/brokers/inifile_broker.py index e8113e6..735d3fc 100644 --- a/x2gobroker/brokers/inifile_broker.py +++ b/x2gobroker/brokers/inifile_broker.py @@ -19,8 +19,7 @@ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. """\ -L{inifile.X2GoBroker} class - a simple X2GoBroker implementations that uses text-based config files only -and does not support load balancing. +L{inifile.X2GoBroker} class - a simple X2GoBroker implementations that uses text-based config files (also supports load balancing) """ __NAME__ = 'x2gobroker-pylib' diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 2d069d3..9087027 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -89,7 +89,7 @@ else: if os.environ.has_key('X2GOBROKER_DEFAULT_BACKEND'): X2GOBROKER_DEFAULT_BACKEND = os.environ['X2GOBROKER_DEFAULT_BACKEND'] else: - X2GOBROKER_DEFAULT_BACKEND = "zeroconf" + X2GOBROKER_DEFAULT_BACKEND = "inifile" if os.environ.has_key('X2GOBROKER_SSL_CERTFILE'): X2GOBROKER_SSL_CERTFILE = os.environ['X2GOBROKER_SSL_CERTFILE'] @@ -116,7 +116,6 @@ X2GOBROKER_HOME = os.path.normpath(os.path.expanduser('~{broker_uid}'.format(bro # defaults for X2Go Sessino Broker configuration file X2GOBROKER_CONFIG_DEFAULTS = { 'global': { - u'backend': u'zeroconf', u'check-credentials': True, u'require-cookie-auth': False, u'use-static-cookie': True, @@ -135,14 +134,14 @@ X2GOBROKER_CONFIG_DEFAULTS = { u'default-agent-query-mode': u'NONE', }, 'zeroconf': { - u'enable': True, + u'enable': False, u'auth-mech': u'pam', u'user-db': u'libnss', u'group-db': u'libnss', u'desktop-shell': u'KDE', }, 'inifile': { - u'enable': False, + u'enable': True, u'session-profiles': u'/etc/x2go/broker/x2gobroker-sessionprofiles.conf', u'auth-mech': u'', u'user-db': u'', 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-110-g547b635
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via 547b635ac534a7ae4221b0be77c681dfed6d818a (commit) from 433911044d5a741726d0153dd588f8ab9fd92d30 (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 547b635ac534a7ae4221b0be77c681dfed6d818a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 22:46:16 2013 +0100 x2gobroker.spec: the x2gobroker requires a valid / real shell, bash for convenience ----------------------------------------------------------------------- Summary of changes: x2gobroker.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2gobroker.spec b/x2gobroker.spec index f1ec5e7..9f99cd3 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -247,7 +247,7 @@ if ! /usr/bin/getent group x2gobroker >/dev/null 2>/dev/null && /usr/sbin/groupa /usr/bin/getent passwd x2gobroker >/dev/null 2>/dev/null || \ /usr/sbin/useradd -c "x2go broker server/user" \ -d "%_localstatedir/lib/x2gobroker" \ - -g x2gobroker -r -s /bin/false x2gobroker || :; + -g x2gobroker -r -s /bin/bash x2gobroker || :; fi; %preun @@ -317,7 +317,7 @@ if ! /usr/bin/getent group x2gobroker >/dev/null 2>/dev/null && \ /usr/bin/getent passwd x2gobroker >/dev/null 2>/dev/null || \ /usr/sbin/useradd -c "x2go broker server/user" \ -d "%_localstatedir/lib/x2gobroker" \ - -g x2gobroker -r -s /bin/false x2gobroker || :; + -g x2gobroker -r -s /bin/bash x2gobroker || :; fi; %preun agent 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-109-g4339110
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via 433911044d5a741726d0153dd588f8ab9fd92d30 (commit) from f93b446f790e56b3d56186e72ebee0bfb7bdd4a7 (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 433911044d5a741726d0153dd588f8ab9fd92d30 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 22:24:38 2013 +0100 x2gobroker.spec: python-pampy is python-pampy in the RHEL world, not python-pam ----------------------------------------------------------------------- Summary of changes: x2gobroker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker.spec b/x2gobroker.spec index 5f6bf0e..f1ec5e7 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -22,7 +22,7 @@ BuildRequires: systemd Requires: logrotate Requires: python-argparse Requires: python-netaddr -Requires: python-pam +Requires: python-pampy Requires: python-paramiko Requires: python-setproctitle Requires: python-tornado 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-108-gf93b446
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via f93b446f790e56b3d56186e72ebee0bfb7bdd4a7 (commit) from b97d66ff8c3e67b4467b4c4a511ece27000a2d4e (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 f93b446f790e56b3d56186e72ebee0bfb7bdd4a7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 22:02:28 2013 +0100 x2gobroker.spec: add man page for x2gobroker-keygen to RPM package ----------------------------------------------------------------------- Summary of changes: x2gobroker.spec | 1 + 1 file changed, 1 insertion(+) The diff of changes is: diff --git a/x2gobroker.spec b/x2gobroker.spec index ebfb93b..5f6bf0e 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -340,6 +340,7 @@ fi; %_sbindir/x2gobroker-keygen %python_sitelib/x2gobroker* %_mandir/man1/x2gobroker*.1* +%_mandir/man8/x2gobroker-keygen.8* %files authservice 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-107-gb97d66f
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via b97d66ff8c3e67b4467b4c4a511ece27000a2d4e (commit) from 0b07a2df4485458027caea5fabcc133b38c0229e (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 b97d66ff8c3e67b4467b4c4a511ece27000a2d4e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 21:58:40 2013 +0100 x2gobroker.spec: completely remove the permissions.d stuff ----------------------------------------------------------------------- Summary of changes: x2gobroker.spec | 28 ---------------------------- 1 file changed, 28 deletions(-) The diff of changes is: diff --git a/x2gobroker.spec b/x2gobroker.spec index b16b68a..ebfb93b 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -238,29 +238,10 @@ install -pm0755 "init/x2gobroker-daemon.init" \ # # Totally distro-specific # -#mkdir -p "$b/%_sysconfdir/permissions.d" -#pushd "$b/%_sysconfdir/permissions.d/" -#cat >"%name.easy" <<-EOF -# %_localstatedir/log/x2gobroker x2gobroker.x2gobroker 02750 -# %_localstatedir/lib/x2gobroker x2gobroker.x2gobroker 00750 -#EOF -#cp "%name.easy" "%name.secure" -#cp "%name.easy" "%name.paranoid" -#cat >"%name-agent.easy" <<-EOF -# %_libexecdir/x2go/x2gobroker-agent root.x2gobroker 04750 -#EOF -#cp "%name-agent.easy" "%name-agent.secure" -#cp "%name-agent.easy" "%name-agent.paranoid" -#popd %if 0%{?fdupes:1} %fdupes %buildroot/%_prefix %endif -#%if 0%{?suse_version} -#%verifyscript -#%verify_permissions -e %_libexecdir/x2go/x2gobroker-agent -#%endif - %pre if ! /usr/bin/getent group x2gobroker >/dev/null 2>/dev/null && /usr/sbin/groupadd -r x2gobroker; then /usr/bin/getent passwd x2gobroker >/dev/null 2>/dev/null || \ @@ -339,13 +320,6 @@ if ! /usr/bin/getent group x2gobroker >/dev/null 2>/dev/null && \ -g x2gobroker -r -s /bin/false x2gobroker || :; fi; -%post agent -%if 0%{?set_permissions:1} -%set_permissions %_libexecdir/x2go/x2gobroker-agent -%else -%run_permissions -%endif - %preun agent if /usr/bin/getent passwd x2gobroker >/dev/null 2>/dev/null && ! type x2gobroker; then /usr/sbin/userdel x2gobroker; @@ -382,7 +356,6 @@ fi; %_initddir/x2gobroker-daemon %config %_sysconfdir/default/x2gobroker-daemon %config %_sysconfdir/logrotate.d/x2gobroker-daemon -%config %_sysconfdir/permissions.d/x2gobroker.* %attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker %attr(00750,x2gobroker,x2gobroker) %_localstatedir/lib/x2gobroker %_sbindir/x2gobroker-daemon-debug @@ -399,7 +372,6 @@ fi; %defattr(-,root,root) %attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker %attr(00750,x2gobroker,x2gobroker) %_localstatedir/lib/x2gobroker -%config %_sysconfdir/permissions.d/x2gobroker-agent.* %dir %_libexecdir/x2go %attr(04750,root,x2gobroker) %_libexecdir/x2go/x2gobroker-agent %_libexecdir/x2go/x2gobroker-agent.pl 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits December 2013