The branch, statusflag has been updated via 4a954b4d9b2914d50e1b5c1336dcd4fbdc59fa0c (commit) from 44ea64ed166c3f4db6e56faebc0453641eb2e01a (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2gobroker/authmechs/{base.py => base_authmech.py} | 0 .../{htpasswd_mech.py => htpasswd_authmech.py} | 0 .../authmechs/{pam_mech.py => pam_authmech.py} | 0 x2gobroker/authmechs/testsuite_mech.py | 29 -------------------- x2gobroker/brokers/{base.py => base_broker.py} | 2 +- .../brokers/{inifile.py => inifile_broker.py} | 2 +- x2gobroker/brokers/{ldap.py => ldap_broker.py} | 2 +- .../brokers/{zeroconf.py => zeroconf_broker.py} | 0 x2gobroker/defaults.py | 2 +- .../nameservices/{base.py => base_nameservice.py} | 0 x2gobroker/nameservices/libnss_nameservice.py | 2 +- x2gobroker/nameservices/testsuite_nameservice.py | 2 +- x2gobroker/web/html.py | 4 +-- x2gobroker/web/plain.py | 4 +-- 14 files changed, 10 insertions(+), 39 deletions(-) rename x2gobroker/authmechs/{base.py => base_authmech.py} (100%) rename x2gobroker/authmechs/{htpasswd_mech.py => htpasswd_authmech.py} (100%) rename x2gobroker/authmechs/{pam_mech.py => pam_authmech.py} (100%) delete mode 100644 x2gobroker/authmechs/testsuite_mech.py rename x2gobroker/brokers/{base.py => base_broker.py} (99%) rename x2gobroker/brokers/{inifile.py => inifile_broker.py} (99%) rename x2gobroker/brokers/{ldap.py => ldap_broker.py} (96%) rename x2gobroker/brokers/{zeroconf.py => zeroconf_broker.py} (100%) rename x2gobroker/nameservices/{base.py => base_nameservice.py} (100%) The diff of changes is: diff --git a/x2gobroker/authmechs/base.py b/x2gobroker/authmechs/base_authmech.py similarity index 100% rename from x2gobroker/authmechs/base.py rename to x2gobroker/authmechs/base_authmech.py diff --git a/x2gobroker/authmechs/htpasswd_mech.py b/x2gobroker/authmechs/htpasswd_authmech.py similarity index 100% rename from x2gobroker/authmechs/htpasswd_mech.py rename to x2gobroker/authmechs/htpasswd_authmech.py diff --git a/x2gobroker/authmechs/pam_mech.py b/x2gobroker/authmechs/pam_authmech.py similarity index 100% rename from x2gobroker/authmechs/pam_mech.py rename to x2gobroker/authmechs/pam_authmech.py diff --git a/x2gobroker/authmechs/testsuite_mech.py b/x2gobroker/authmechs/testsuite_mech.py deleted file mode 100644 index c2aea0b..0000000 --- a/x2gobroker/authmechs/testsuite_mech.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder@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 -# 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. - -class X2GoBrokerAuthMech(object): - - def authenticate(self, username, password): - - # return C{True} for user test with password sweet... (used by the unit tests) - if username == 'test' and password == 'sweet': - return True - return False - diff --git a/x2gobroker/brokers/base.py b/x2gobroker/brokers/base_broker.py similarity index 99% rename from x2gobroker/brokers/base.py rename to x2gobroker/brokers/base_broker.py index 79a5542..e5fd314 100644 --- a/x2gobroker/brokers/base.py +++ b/x2gobroker/brokers/base_broker.py @@ -300,7 +300,7 @@ class X2GoBroker(object): def _import_authmech_module(self, mech='pam'): try: if self.authmech_module is None: - exec("import x2gobroker.authmechs.{mech}_mech as _authmech_module".format(mech=mech)) + exec("import x2gobroker.authmechs.{mech}_authmech as _authmech_module".format(mech=mech)) self.authmech_module = _authmech_module return True except ImportError: diff --git a/x2gobroker/brokers/inifile.py b/x2gobroker/brokers/inifile_broker.py similarity index 99% rename from x2gobroker/brokers/inifile.py rename to x2gobroker/brokers/inifile_broker.py index 969c433..2e21846 100644 --- a/x2gobroker/brokers/inifile.py +++ b/x2gobroker/brokers/inifile_broker.py @@ -28,7 +28,7 @@ __NAME__ = 'x2gobroker-pylib' # modules # Python X2GoBroker modules -import base +import base_broker as base import x2gobroker.config import x2gobroker.defaults diff --git a/x2gobroker/brokers/ldap.py b/x2gobroker/brokers/ldap_broker.py similarity index 96% rename from x2gobroker/brokers/ldap.py rename to x2gobroker/brokers/ldap_broker.py index 8f631ab..61857d8 100644 --- a/x2gobroker/brokers/ldap.py +++ b/x2gobroker/brokers/ldap_broker.py @@ -25,7 +25,7 @@ L{ldap.X2GoBroker} class - a production X2GoBroker implementations that uses LDA __NAME__ = 'x2gobroker-pylib' # modules -import x2gobroker.base +import x2gobroker.base_broker as base class X2GoBroker(x2gobroker.base.X2GoBroker): """\ diff --git a/x2gobroker/brokers/zeroconf.py b/x2gobroker/brokers/zeroconf_broker.py similarity index 100% rename from x2gobroker/brokers/zeroconf.py rename to x2gobroker/brokers/zeroconf_broker.py diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index fb70a34..0769f8e 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -34,7 +34,7 @@ else: if os.environ.has_key('X2GOBROKER_SESSIONPROFILES'): X2GOBROKER_SESSIONPROFILES=os.environ['X2GOBROKER_SESSIONPROFILES'] else: - X2GOBROKER_SESSIONPROFILES="/etc/x2go/x2gobroker-sessionprofiles.conf" + X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf" if os.environ.has_key('X2GOBROKER_AGENT_CMD'): X2GOBROKER_AGENT_CMD=os.environ['X2GOBROKER_AGENT_CMD'] diff --git a/x2gobroker/nameservices/base.py b/x2gobroker/nameservices/base_nameservice.py similarity index 100% rename from x2gobroker/nameservices/base.py rename to x2gobroker/nameservices/base_nameservice.py diff --git a/x2gobroker/nameservices/libnss_nameservice.py b/x2gobroker/nameservices/libnss_nameservice.py index 4636a13..c7a6e84 100644 --- a/x2gobroker/nameservices/libnss_nameservice.py +++ b/x2gobroker/nameservices/libnss_nameservice.py @@ -23,7 +23,7 @@ import pwd import grp # Python X2GoBroker modules -import base +import base_nameservice as base class X2GoBrokerNameService(base.X2GoBrokerNameService): diff --git a/x2gobroker/nameservices/testsuite_nameservice.py b/x2gobroker/nameservices/testsuite_nameservice.py index e2a0e1f..e1e8173 100644 --- a/x2gobroker/nameservices/testsuite_nameservice.py +++ b/x2gobroker/nameservices/testsuite_nameservice.py @@ -19,7 +19,7 @@ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # Python X2GoBroker modules -import base +import base_nameservice as base class X2GoBrokerNameService(base.X2GoBrokerNameService): diff --git a/x2gobroker/web/html.py b/x2gobroker/web/html.py index c7e40ba..a85a1ff 100644 --- a/x2gobroker/web/html.py +++ b/x2gobroker/web/html.py @@ -75,8 +75,8 @@ $output # silence pyflakes... broker_backend = None - exec("import x2gobroker.brokers.{backend}".format(backend=backend)) - exec("broker_backend = x2gobroker.brokers.{backend}.X2GoBroker()".format(backend=backend)) + exec("import x2gobroker.brokers.{backend}_broker".format(backend=backend)) + exec("broker_backend = x2gobroker.brokers.{backend}_broker.X2GoBroker()".format(backend=backend)) global_config = broker_backend.get_global_config() backend_config = broker_backend.get_backend_config(backend) diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index 2fd001f..ea0dfc8 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -52,8 +52,8 @@ class X2GoBrokerWebPlain: # silence pyflakes... broker_backend = None # dynamically detect broker backend from given URL - exec("import x2gobroker.brokers.{backend}".format(backend=backend)) - exec("broker_backend = x2gobroker.brokers.{backend}.X2GoBroker()".format(backend=backend)) + exec("import x2gobroker.brokers.{backend}_broker".format(backend=backend)) + exec("broker_backend = x2gobroker.brokers.{backend}_broker.X2GoBroker()".format(backend=backend)) global_config = broker_backend.get_global_config() backend_config = broker_backend.get_backend_config() 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).