From 63b7e47ea39c6ab938d93c633f0b09e0b849bf3f Mon Sep 17 00:00:00 2001 From: Daniel STAN Date: Sat, 18 May 2013 18:51:39 +0200 Subject: [PATCH] =?UTF-8?q?Revert=20[GlobalPython]=20(restes=20qui=20n'?= =?UTF-8?q?=C3=A9taient=20pas=20effac=C3=A9s)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2aaa97e7d1436719d7e627d0b784f5475337ebc2. --- Bundler/bcfg2.xml | 1 - Python/etc/bcfg2.conf | 2 +- etc/python/global_common.py | 28 ---------------------------- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 etc/python/global_common.py diff --git a/Bundler/bcfg2.xml b/Bundler/bcfg2.xml index 69d494e..0d14702 100644 --- a/Bundler/bcfg2.xml +++ b/Bundler/bcfg2.xml @@ -3,7 +3,6 @@ - diff --git a/Python/etc/bcfg2.conf b/Python/etc/bcfg2.conf index 3937e77..16822da 100644 --- a/Python/etc/bcfg2.conf +++ b/Python/etc/bcfg2.conf @@ -7,7 +7,7 @@ header("Fichier de configuration de bcfg2") if has("bcfg2-server"): @[server] %repository = "/var/lib/bcfg2" - %plugins = "Metadata,Bundler,Base,SSHbase,Cfg,Rules,Python,Packages,Probes,DBStats,GlobalPython" + %plugins = "Metadata,Bundler,Base,SSHbase,Cfg,Rules,Python,Packages,Probes,DBStats" %svn = "no" @ diff --git a/etc/python/global_common.py b/etc/python/global_common.py deleted file mode 100644 index 0ebcdf7..0000000 --- a/etc/python/global_common.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- -# -# global_common.py -# --------- -# -# Copyright (C) 2013 Raphaƫl Cauderlier -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This file 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. - -"""Fichier inclu par tous les scripts du plugin GlobalPython de bcfg2""" - -import Bcfg2.Server.Plugins.Metadata - -query = global_metadata.query - -all_clients = query.all()