diff options
Diffstat (limited to 'src/lib/Server')
| -rw-r--r-- | src/lib/Server/Admin/__init__.py | 2 | ||||
| -rw-r--r-- | src/lib/Server/Core.py | 23 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/Metadata.py | 6 |
3 files changed, 17 insertions, 14 deletions
diff --git a/src/lib/Server/Admin/__init__.py b/src/lib/Server/Admin/__init__.py index d059e0a1d..57b9d2a86 100644 --- a/src/lib/Server/Admin/__init__.py +++ b/src/lib/Server/Admin/__init__.py @@ -1,4 +1,4 @@ -__revision__ = '$Revision: $' +__revision__ = '$Revision$' __all__ = ['Mode', 'Client', 'Compare', 'Fingerprint', 'Init', 'Minestruct', 'Pull', 'Tidy', 'Viz'] diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py index 76cbb8073..7e347bc23 100644 --- a/src/lib/Server/Core.py +++ b/src/lib/Server/Core.py @@ -4,6 +4,7 @@ __revision__ = '$Revision$' from time import time from Bcfg2.Server.Plugin import PluginInitError, PluginExecutionError from Bcfg2.Server.Statistics import Statistics +from Bcfg2.Settings import settings import logging, lxml.etree, os, stat, ConfigParser import Bcfg2.Server.Plugins.Metadata @@ -198,11 +199,9 @@ except ImportError: class Core(object): '''The Core object is the container for all Bcfg2 Server logic, and modules''' - def __init__(self, setup, configfile): + def __init__(self): object.__init__(self) - self.cfile = ConfigParser.ConfigParser() - self.cfile.read([configfile]) - self.datastore = self.cfile.get('server','repository') + self.datastore = settings.SERVER_REPOSITORY try: self.fam = monitor() except IOError: @@ -211,20 +210,22 @@ class Core(object): self.generators = [] self.structures = [] self.cron = {} - self.setup = setup self.plugins = {} self.revision = '-1' + try: - self.svn = self.cfile.get('server', 'svn') == 'yes' - self.read_svn_revision() + if settings.SERVER_SVN: + self.read_svn_revision() except: - self.svn = False + settings.SERVER_SVN = False + + self.svn = settings.SERVER_SVN - mpath = self.cfile.get('server','repository') + mpath = settings.SERVER_REPOSITORY self.stats = Statistics("%s/etc/statistics.xml" % (mpath)) - structures = self.cfile.get('server', 'structures').replace(' ', '').split(',') - generators = self.cfile.get('server', 'generators').replace(' ', '').split(',') + structures = settings.SERVER_STRUCTURES + generators = settings.SERVER_GENERATORS [data.remove('') for data in [structures, generators] if '' in data] for plugin in structures + generators + ['Metadata']: diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py index ce9d18f7a..5f3262ec0 100644 --- a/src/lib/Server/Plugins/Metadata.py +++ b/src/lib/Server/Plugins/Metadata.py @@ -1,7 +1,9 @@ '''This file stores persistent metadata for the BCFG Configuration Repository''' __revision__ = '$Revision$' -import lxml.etree, re, socket, time, sys, ConfigParser +from Bcfg2.Settings import settings + +import lxml.etree, re, socket, time, sys import Bcfg2.Server.Plugin class MetadataConsistencyError(Exception): @@ -67,7 +69,7 @@ class Metadata(Bcfg2.Server.Plugin.Plugin): self.ptimes = {} self.pctime = 0 self.extra = {'groups.xml':[], 'clients.xml':[]} - self.password = core.cfile.get('communication', 'password') + self.password = settings.COMMUNICATION_PASSWORD def HandleEvent(self, event): '''Handle update events for data files''' |