x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

python-wsgilog.git - pristine-tar (branch) created: 43a9388f0d46290c8f97b6da9d5a03c637f67d04
by git-admin＠x2go.org 18 Feb '13

18 Feb '13

The branch, pristine-tar has been created at 43a9388f0d46290c8f97b6da9d5a03c637f67d04 (commit) - Log ----------------------------------------------------------------- commit 43a9388f0d46290c8f97b6da9d5a03c637f67d04 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 18 11:37:39 2013 +0100 pristine-tar data for python-wsgilog_0.3.orig.tar.gz ----------------------------------------------------------------------- hooks/post-receive -- python-wsgilog.git (Debian package python-wsgilog) 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-wsgilog.git" (Debian package python-wsgilog).

1 0

python-wsgilog.git - upstream (branch) created: 086aa63bbd142d238800fa8fd4ca8b8d27df4d6e
by git-admin＠x2go.org 18 Feb '13

18 Feb '13

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

1 0

python-wsgilog.git - master (branch) created: fc26a22de119c4567bb94ff8e99a10bc163bc54d
by git-admin＠x2go.org 18 Feb '13

18 Feb '13

The branch, master has been created at fc26a22de119c4567bb94ff8e99a10bc163bc54d (commit) - Log ----------------------------------------------------------------- commit fc26a22de119c4567bb94ff8e99a10bc163bc54d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 18 11:01:42 2013 +0100 Imported Debian patch 0.3-1 commit 086aa63bbd142d238800fa8fd4ca8b8d27df4d6e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 18 11:37:35 2013 +0100 Imported Upstream version 0.3 ----------------------------------------------------------------------- hooks/post-receive -- python-wsgilog.git (Debian package python-wsgilog) 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-wsgilog.git" (Debian package python-wsgilog).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.1-13-g5ef433d
by git-admin＠x2go.org 18 Feb '13

18 Feb '13

The branch, master has been updated via 5ef433db9f943afd56b15351cceb2021184ed43e (commit) from b03b7cbfea28b5d962eef483c7fd98661bf203e8 (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 5ef433db9f943afd56b15351cceb2021184ed43e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 18 06:29:06 2013 +0100 divert logging to stdout if called by other user than user x2gobroker ----------------------------------------------------------------------- Summary of changes: logrotate/x2gobroker | 13 +++++++++++++ sbin/x2gobroker | 2 ++ x2gobroker/loggers.py | 23 ++++++++++++++++++----- 3 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 logrotate/x2gobroker The diff of changes is: diff --git a/logrotate/x2gobroker b/logrotate/x2gobroker new file mode 100644 index 0000000..4e8c689 --- /dev/null +++ b/logrotate/x2gobroker @@ -0,0 +1,13 @@ +/var/log/x2gobroker/*.log { + weekly + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 x2gobroker adm + sharedscripts + postrotate + /etc/init.d/x2gobroker restart > /dev/null + endscript +} diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 7ca11ce..2e8b5b4 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -33,6 +33,8 @@ except ImportError: sys.path.insert(0, os.path.join(os.getcwd(), '..')) import x2gobroker.defaults +from x2gobroker.loggers import logger_broker, logger_access, logger_error + # parse-in potential command line options cmdline_args = None if __name__ == "__main__": diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index 01a659f..7151fd5 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -19,15 +19,28 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +import sys +import getpass import logging import logging.config from x2gobroker.defaults import X2GOBROKER_LOGCONFIG as _X2GOBROKER_LOGCONFIG -logging.config.fileConfig(_X2GOBROKER_LOGCONFIG) +if getpass.getuser() == "x2gobroker": -# create loggers -logger_broker = logging.getLogger('broker') -logger_access = logging.getLogger('access') -logger_error = logging.getLogger('error') + # we run in standalone daemon mode, so let's use the system configuration for logging + logging.config.fileConfig(_X2GOBROKER_LOGCONFIG) + + # create loggers + logger_broker = logging.getLogger('broker') + logger_access = logging.getLogger('access') + logger_error = logging.getLogger('error') + +else: + logger_root = logging.getLogger() + logger_root.addHandler(logging.StreamHandler(sys.stdout)) + + logger_broker = logger_root + logger_access = logger_root + logger_error = logger_root 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.0.1-12-gb03b7cb
by git-admin＠x2go.org 17 Feb '13

17 Feb '13

The branch, master has been updated via b03b7cbfea28b5d962eef483c7fd98661bf203e8 (commit) from abebae8791274f6634adb39d930ae055feed5fbb (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 b03b7cbfea28b5d962eef483c7fd98661bf203e8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Feb 17 12:10:03 2013 +0100 Add logrotate configuration for x2gobroker log files. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/python-x2gobroker.install | 1 + 2 files changed, 2 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f1e7e25..9ed8b0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low - Add load balancing support. - Add foundation for logging support. - Add man page for x2gobroker executable. + - Add logrotate configuration for x2gobroker log files. * /debian/control: + Add bin:package x2gobroker-agent. diff --git a/debian/python-x2gobroker.install b/debian/python-x2gobroker.install index c8bd09a..91aabf6 100644 --- a/debian/python-x2gobroker.install +++ b/debian/python-x2gobroker.install @@ -1,4 +1,5 @@ etc/x2gobroker.conf etc/x2go/ etc/broker etc/x2go/ +logrotate/x2gobroker etc/logrotate.d/ pam/x2gobroker etc/pam.d/ usr/ 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.0.1-11-gabebae8
by git-admin＠x2go.org 17 Feb '13

17 Feb '13

The branch, master has been updated via abebae8791274f6634adb39d930ae055feed5fbb (commit) from 2ce613977c17b31475dc3207652daa00a78f2537 (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 abebae8791274f6634adb39d930ae055feed5fbb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Feb 17 12:04:35 2013 +0100 create log folder with setgid bit set ----------------------------------------------------------------------- Summary of changes: debian/python-x2gobroker.postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/python-x2gobroker.postinst b/debian/python-x2gobroker.postinst index 861b3e0..6299aea 100755 --- a/debian/python-x2gobroker.postinst +++ b/debian/python-x2gobroker.postinst @@ -23,7 +23,7 @@ case "$1" in # the python-x2gobroker needs special permissions on its log directory if ! dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then - dpkg-statoverride --add --update x2gobroker adm 0750 /var/log/x2gobroker + dpkg-statoverride --add --update x2gobroker adm 2750 /var/log/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.0.1-10-g2ce6139
by git-admin＠x2go.org 17 Feb '13

17 Feb '13

The branch, master has been updated via 2ce613977c17b31475dc3207652daa00a78f2537 (commit) via d04c71a2781be037ebbb3bdc9441019409c9c2a8 (commit) from bbe2c8ab570f8f3e4b0e54a79117b9d93488de40 (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 2ce613977c17b31475dc3207652daa00a78f2537 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Feb 17 12:01:36 2013 +0100 remove debug stdout code commit d04c71a2781be037ebbb3bdc9441019409c9c2a8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Feb 17 11:59:34 2013 +0100 Add man page for x2gobroker executable. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/x2gobroker.manpages | 1 + man/man8/x2gobroker.8 | 56 ++++++++++++++++++++++++++++++++++++++++++++ x2gobroker/loggers.py | 2 -- 4 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 debian/x2gobroker.manpages create mode 100644 man/man8/x2gobroker.8 The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c8ec285..f1e7e25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low - Make host session option a list, not string. - Add load balancing support. - Add foundation for logging support. + - Add man page for x2gobroker executable. * /debian/control: + Add bin:package x2gobroker-agent. diff --git a/debian/x2gobroker.manpages b/debian/x2gobroker.manpages new file mode 100644 index 0000000..b010d6d --- /dev/null +++ b/debian/x2gobroker.manpages @@ -0,0 +1 @@ +man/man8/x2gobroker.8 \ No newline at end of file diff --git a/man/man8/x2gobroker.8 b/man/man8/x2gobroker.8 new file mode 100644 index 0000000..6782fda --- /dev/null +++ b/man/man8/x2gobroker.8 @@ -0,0 +1,56 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gobroker 8 "Feb 2013" "Version 0.0.1.y" "X2Go Session Broker" +.SH NAME +x2gobroker \- Session Broker for X2Go +.SH SYNOPSIS +'nh +.fi +.ad l +\fBx2gobroker\fR \kx +.if (\nx>(\n(.l/2)) .nr x (\n(.l/5) +'in \n(.iu+\nxu +[ +\fIoptions\fR +] +'in \n(.iu-\nxu +.ad b +'hy +.SH DESCRIPTION +\fBx2gobroker\fR is a Web.py based implementation of the X2Go Session Broker API. +.PP +See the included README and TODO for further information on \fBx2gobroker\fR. +.SH COMMON OPTIONS +\fBx2gobroker\fR accepts the following common options: +.TP +\*(T<\fB\-h, \-\-help\fR\*(T> +Display a help with all available command line options and exit. +.TP +\*(T<\fB\-d, \-\-debug\fR\*(T> +Enable debugging code. This also makes http\'s POST method available as GET method, which then allows it to test the +broker API through a normal web browser. +.TP +\*(T<\fB\-d, \-\-config FILENAME\fR\*(T> +Specify an alternative configuration file name, default is: \fI/etc/x2go/x2gobroker.conf\fR. +.SH DAEMON OPTIONS +\fBx2gobroker\fR accepts the following daemon options: +.TP +\*(T<\fB\-b, \-\-bind ADDRESS:PORT\fR\*(T> +The [address:]port that the Web.py http-engine will bind to (default: 127.0.0.1:8080). +.SH "FILES" +/etc/x2go/x2gobroker.conf, /etc/x2go/broker/* (configuration files) +.PP +/etc/default/x2gobroker-daemon (environment for X2Go Session Broker when run +as standalone daemon) +.PP +/var/log/x2gobroker/* (log files of X2Go Session Broker) +.SH "SEE ALSO" +\fB/usr/share/doc/x2gobroker\fR +.SH AUTHOR +This manual has been written for the X2Go project by +Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>. diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index 4493091..01a659f 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -26,8 +26,6 @@ from x2gobroker.defaults import X2GOBROKER_LOGCONFIG as _X2GOBROKER_LOGCONFIG logging.config.fileConfig(_X2GOBROKER_LOGCONFIG) -print dir(logging.config) - # create loggers logger_broker = logging.getLogger('broker') logger_access = logging.getLogger('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

x2gobroker.git - master (branch) updated: 0.0.0.1-8-gbbe2c8a
by git-admin＠x2go.org 17 Feb '13

17 Feb '13

The branch, master has been updated via bbe2c8ab570f8f3e4b0e54a79117b9d93488de40 (commit) from fe7f06c112518bbac361c7e9f80ed721379a0e3b (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 bbe2c8ab570f8f3e4b0e54a79117b9d93488de40 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Feb 17 11:45:35 2013 +0100 Add foundation for logging support. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/python-x2gobroker.dirs | 3 +- ...r-agent.postinst => python-x2gobroker.postinst} | 27 +------ ...roker-agent.postrm => python-x2gobroker.postrm} | 11 +-- etc/broker/x2gobroker-loggers.conf | 81 ++++++++++++++++++++ x2gobroker/defaults.py | 5 ++ x2gobroker/{brokers/ldap_broker.py => loggers.py} | 20 ++--- 7 files changed, 107 insertions(+), 41 deletions(-) copy debian/{x2gobroker-agent.postinst => python-x2gobroker.postinst} (51%) copy debian/{x2gobroker-agent.postrm => python-x2gobroker.postrm} (70%) create mode 100644 etc/broker/x2gobroker-loggers.conf copy x2gobroker/{brokers/ldap_broker.py => loggers.py} (68%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0984633..c8ec285 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low - Make CC, CFLAGS and LDFLAGS configurable through build system. - Make host session option a list, not string. - Add load balancing support. + - Add foundation for logging support. * /debian/control: + Add bin:package x2gobroker-agent. diff --git a/debian/python-x2gobroker.dirs b/debian/python-x2gobroker.dirs index 2fd303e..2396e1d 100644 --- a/debian/python-x2gobroker.dirs +++ b/debian/python-x2gobroker.dirs @@ -1,2 +1,3 @@ /etc/x2go -/etc/pam.d \ No newline at end of file +/etc/pam.d +/var/log/x2gobroker \ No newline at end of file diff --git a/debian/x2gobroker-agent.postinst b/debian/python-x2gobroker.postinst similarity index 51% copy from debian/x2gobroker-agent.postinst copy to debian/python-x2gobroker.postinst index 95faece..861b3e0 100755 --- a/debian/x2gobroker-agent.postinst +++ b/debian/python-x2gobroker.postinst @@ -1,13 +1,10 @@ #!/bin/sh -# postinst script for x2gobroker-agent +# postinst script for python-x2gobroker # # see: dh_installdeb(1) set -e -# Source debconf library. -. /usr/share/debconf/confmodule - # summary of how this script can be called: # * <postinst> `configure' <most-recently-configured-version> # * <old-postinst> `abort-upgrade' <new version> @@ -24,25 +21,9 @@ set -e case "$1" in configure) - # setup user/group x2gobroker - if ! getent group x2gobroker >/dev/null; then - echo "Creating x2gobroker group." >&2 - addgroup --system x2gobroker - else - echo "Group x2gobroker already exists." >&2 - fi - if ! getent passwd x2gobroker >/dev/null; then - echo "Creating x2gobroker user." >&2 - adduser --system --no-create-home \ - --disabled-password --disabled-login \ - --shell /bin/false --group --home /dev/null x2gobroker - else - echo "User x2gobroker already exists." >&2 - fi - - # the x2gobroker-agent has to be installed setuid root - if ! dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent >/dev/null; then - dpkg-statoverride --add --update root x2gobroker 4750 /usr/lib/x2go/x2gobroker-agent + # the python-x2gobroker needs special permissions on its log directory + if ! dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then + dpkg-statoverride --add --update x2gobroker adm 0750 /var/log/x2gobroker fi ;; diff --git a/debian/x2gobroker-agent.postrm b/debian/python-x2gobroker.postrm similarity index 70% copy from debian/x2gobroker-agent.postrm copy to debian/python-x2gobroker.postrm index d703d32..22abe93 100755 --- a/debian/x2gobroker-agent.postrm +++ b/debian/python-x2gobroker.postrm @@ -18,15 +18,10 @@ set -e case "$1" in purge) - if dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent >/dev/null; then - dpkg-statoverride --remove /usr/lib/x2go/x2gobroker-agent + if dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then + dpkg-statoverride --remove /var/log/x2gobroker fi - # remove user/group x2gobroker from system - getent passwd x2gobroker >/dev/null && deluser x2gobroker - getent group x2gobroker >/dev/null && delgroup x2gobroker - getent group x2gobroker >/dev/null && delgroup x2gobroker - ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; @@ -41,4 +36,4 @@ esac #DEBHELPER# -exit 0 \ No newline at end of file +exit 0 diff --git a/etc/broker/x2gobroker-loggers.conf b/etc/broker/x2gobroker-loggers.conf new file mode 100644 index 0000000..36d5e3e --- /dev/null +++ b/etc/broker/x2gobroker-loggers.conf @@ -0,0 +1,81 @@ +# This file is part of the X2Go Project - http://www.x2go.org +# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# +# X2Go Session Broker is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# X2Go Session Broker is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +[loggers] +keys=root,broker,access,error + +[logger_root] +level=NOTSET +handlers=stdoutHandler + +[handlers] +keys=stdoutHandler,brokerFileHandler,accessFileHandler,errorFileHandler + +[formatters] +keys=brokerFormatter,accessFormatter,errorFormatter + +[handler_stdoutHandler] +class=StreamHandler +args=(sys.stdout,) + +[logger_broker] +level=DEBUG +handlers=brokerFileHandler +qualname=broker +propagate=0 + +[handler_brokerFileHandler] +class=FileHandler +formatter=brokerFormatter +args=('/var/log/x2gobroker/broker.log',) + +[formatter_brokerFormatter] +format=%(asctime)s - %(name)s - %(levelname)s - %(message)s +datefmt= + +[logger_access] +level=DEBUG +handlers=accessFileHandler +qualname=access +propagate=0 + +[handler_accessFileHandler] +class=FileHandler +formatter=accessFormatter +args=('/var/log/x2gobroker/access.log',) + +[formatter_accessFormatter] +format=%(asctime)s - %(name)s - %(levelname)s - %(message)s +datefmt= + +[logger_error] +level=DEBUG +handlers=errorFileHandler +qualname=error +propagate=0 + +[handler_errorFileHandler] +class=FileHandler +formatter=accessFormatter +args=('/var/log/x2gobroker/error.log',) + +[formatter_errorFormatter] +format=%(asctime)s - %(name)s - %(levelname)s - %(message)s +datefmt= diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 48b61d8..b85a296 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -31,6 +31,11 @@ if os.environ.has_key('X2GOBROKER_CONFIG'): else: X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" +if os.environ.has_key('X2GOBROKER_LOGCONFIG'): + X2GOBROKER_LOGCONFIG=os.environ['X2GOBROKER_LOGCONFIG'] +else: + X2GOBROKER_LOGCONFIG="/etc/x2go/broker/x2gobroker-loggers.conf" + if os.environ.has_key('X2GOBROKER_SESSIONPROFILES'): X2GOBROKER_SESSIONPROFILES=os.environ['X2GOBROKER_SESSIONPROFILES'] else: diff --git a/x2gobroker/brokers/ldap_broker.py b/x2gobroker/loggers.py similarity index 68% copy from x2gobroker/brokers/ldap_broker.py copy to x2gobroker/loggers.py index 61857d8..4493091 100644 --- a/x2gobroker/brokers/ldap_broker.py +++ b/x2gobroker/loggers.py @@ -2,6 +2,7 @@ # Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -18,16 +19,17 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -"""\ -L{ldap.X2GoBroker} class - a production X2GoBroker implementations that uses LDAP as configuration backend +import logging +import logging.config -""" -__NAME__ = 'x2gobroker-pylib' +from x2gobroker.defaults import X2GOBROKER_LOGCONFIG as _X2GOBROKER_LOGCONFIG -# modules -import x2gobroker.base_broker as base +logging.config.fileConfig(_X2GOBROKER_LOGCONFIG) -class X2GoBroker(x2gobroker.base.X2GoBroker): - """\ +print dir(logging.config) + +# create loggers +logger_broker = logging.getLogger('broker') +logger_access = logging.getLogger('access') +logger_error = logging.getLogger('error') - """ 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.0.1-7-gfe7f06c
by git-admin＠x2go.org 17 Feb '13

17 Feb '13

The branch, master has been updated via fe7f06c112518bbac361c7e9f80ed721379a0e3b (commit) from 5231ba48183cc603a5193400884dd01b360491ba (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 fe7f06c112518bbac361c7e9f80ed721379a0e3b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Feb 17 10:40:51 2013 +0100 some minor fixes found during first load balancing tests ----------------------------------------------------------------------- Summary of changes: debian/x2gobroker-daemon.default | 9 ++++++++- debian/x2gobroker-daemon.init | 6 +++--- etc/x2gobroker.conf | 2 +- sbin/x2gobroker | 3 +++ 4 files changed, 15 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/x2gobroker-daemon.default b/debian/x2gobroker-daemon.default index 47ccb43..452a75b 100644 --- a/debian/x2gobroker-daemon.default +++ b/debian/x2gobroker-daemon.default @@ -24,7 +24,14 @@ 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 ### +########################################################## +### ### +### Enable SSL Support ### +### o You have to create your own SSL certificates ### +### o You have to actively uncomment the below SSL ### +### relevant line to enable https:// in x2gobroker ### +### ### +########################################################## # SSL certificate file #X2GOBROKER_SSL_CERTFILE=/etc/x2go/broker/ssl/broker.crt diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init index 0ee9aed..d14bb8f 100644 --- a/debian/x2gobroker-daemon.init +++ b/debian/x2gobroker-daemon.init @@ -36,10 +36,10 @@ X2GOBROKER_SSL_CERTFILE= X2GOBROKER_SSL_KEYFILE= test -f $DEBIANCONFIG && . $DEBIANCONFIG -export X2GOBROKER_DEBUG=0 -export X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" +export X2GOBROKER_DEBUG +export X2GOBROKER_CONFIG export X2GOBROKER_DEFAULT_BACKEND -export X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf" +export X2GOBROKER_SESSIONPROFILES export X2GOBROKER_AGENT_CMD export X2GOBROKER_SSL_CERTFILE export X2GOBROKER_SSL_KEYFILE diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index 0999376..83f6bd8 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -88,7 +88,7 @@ # on large deployments it is recommended to ignore primary group memberships # traversing into all user accounts for primary group detection can be quite # CPU intensive on the X2Go Broker server. -#ignore-primary-group-memberships = True +#ignore-primary-group-memberships = true ### ### BACKEND section diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 5c1fdd8..7ca11ce 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -61,6 +61,9 @@ if __name__ == "__main__": x2gobroker.defaults.X2GOBROKER_CONFIG = cmdline_args.config_file x2gobroker.defaults.X2GOBROKER_DEBUG = cmdline_args.debug + # some people just give the port but prepend a colon, webpy does not like this, so we strip if off + cmdline_args.bind = cmdline_args.bind.lstrip(':') + # import classes serving the different web.py URLs from x2gobroker.web.plain import * 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.0.0-18-gf43fbaa
by git-admin＠x2go.org 16 Feb '13

16 Feb '13

The branch, master has been updated via f43fbaae0f087fb73a7afcd49037ac21a9c9f8c1 (commit) from 6c22593e134895ebb363e9851f457c3205257d71 (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 f43fbaae0f087fb73a7afcd49037ac21a9c9f8c1 Author: Terje Andersen <teranders(a)gmail.com> Date: Sat Feb 16 12:31:38 2013 +0100 rebuild i18n files ----------------------------------------------------------------------- Summary of changes: x2goclient_fr.ts | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) The diff of changes is: diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts index abbba81..6a8c203 100644 --- a/x2goclient_fr.ts +++ b/x2goclient_fr.ts @@ -1373,7 +1373,7 @@ you can install sshd with </message> <message> <source>Form</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Formulaire</translation> </message> <message> <source>Print</source> @@ -1486,6 +1486,13 @@ lpr -P hp_laserjet</source> </message> </context> <context> + <name>QObject</name> + <message> + <source>No response received from the remote server. Do you want to terminate the current session?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>SessionButton</name> <message> <source>Session preferences...</source> @@ -1517,15 +1524,15 @@ lpr -P hp_laserjet</source> </message> <message> <source>New Session</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Nouvelle session</translation> </message> <message> <source>running</source> - <translation type="unfinished"></translation> + <translation type="unfinished">en cours</translation> </message> <message> <source>suspended</source> - <translation type="unfinished"></translation> + <translation type="unfinished">suspendue</translation> </message> <message> <source>KDE</source> @@ -1533,7 +1540,7 @@ lpr -P hp_laserjet</source> </message> <message> <source>RDP connection</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Connection RDP</translation> </message> <message> <source>XDMCP</source> @@ -1541,7 +1548,7 @@ lpr -P hp_laserjet</source> </message> <message> <source>Connection to local desktop</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Connection au bureau local</translation> </message> <message> <source>Published applications</source> @@ -1592,12 +1599,12 @@ lpr -P hp_laserjet</source> </message> <message> <source>&Create session icon on desktop...</source> - <translation type="unfinished"></translation> + <translation type="unfinished">&Créer une icone de session sur le bureau...</translation> </message> <message> <source>Delete</source> <comment>Delete</comment> - <translation type="unfinished"></translation> + <translation type="unfinished">Effacer</translation> </message> <message> <source>Session management</source> @@ -1624,7 +1631,7 @@ lpr -P hp_laserjet</source> </message> <message> <source>Login:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Identifiant:</translation> </message> <message> <source>SSH port:</source> @@ -1676,7 +1683,7 @@ lpr -P hp_laserjet</source> </message> <message> <source>Type:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Type:</translation> </message> <message> <source>Port:</source> @@ -1768,7 +1775,7 @@ lpr -P hp_laserjet</source> </message> <message> <source>Error</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Erreur</translation> </message> <message> <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source> @@ -1888,11 +1895,11 @@ sound system connections through firewalls</source> </message> <message> <source>us</source> - <translation type="unfinished"></translation> + <translation type="unfinished">us</translation> </message> <message> <source>pc105/us</source> - <translation type="unfinished"></translation> + <translation type="unfinished">pc105/us</translation> </message> <message> <source>password</source> @@ -1919,7 +1926,7 @@ sound system connections through firewalls</source> </message> <message> <source>Delete</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Effacer</translation> </message> <message> <source>Path:</source> @@ -1931,7 +1938,7 @@ sound system connections through firewalls</source> </message> <message> <source>Select folder</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Choisir un dossier</translation> </message> <message> <source>Filename encoding</source> @@ -1955,7 +1962,7 @@ sound system connections through firewalls</source> </message> <message> <source>Error</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Erreur</translation> </message> <message> <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source> @@ -2071,7 +2078,7 @@ sound system connections through firewalls</source> <name>XSettingsWidgetUI</name> <message> <source>Form</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Formulaire</translation> </message> <message> <source>You must restart the X2Go Client for the changes to take effect</source> 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits