moved plugin-specific configs to main config file; propagate "setup" object to server Core

1 files changed, 0 insertions, 62 deletions

diff --git a/src/lib/Bcfg2/Server/Plugin.py b/src/lib/Bcfg2/Server/Plugin.py
index d7b4baf45..ca37431a2 100644
--- a/src/lib/Bcfg2/Server/Plugin.py
+++ b/src/lib/Bcfg2/Server/Plugin.py
@@ -1211,65 +1211,3 @@ class GroupSpool(Plugin, Generator):
                 return
             reqid = self.core.fam.AddMonitor(name, self)
             self.handles[reqid] = relative
-
-class SimpleConfig(FileBacked,
-                   ConfigParser.SafeConfigParser):
-    ''' a simple plugin config using ConfigParser '''
-    _required = True
-
-    def __init__(self, plugin):
-        filename = os.path.join(plugin.data, plugin.name.lower() + ".conf")
-        self.plugin = plugin
-        self.fam = self.plugin.core.fam
-        self.read_files = set()
-        Bcfg2.Server.Plugin.FileBacked.__init__(self, filename)
-        ConfigParser.SafeConfigParser.__init__(self)
-
-        if (self._required or
-            (not self._required and os.path.exists(self.name))):
-            self.fam.AddMonitor(self.name, self)
-
-    def Index(self):
-        """ Build local data structures """
-        for section in self.sections():
-            self.remove_section(section)
-        self.read_files.update(self.read(self.name))
-
-    def get(self, section, option, **kwargs):
-        """ convenience method for getting config items """
-        default = None
-        if 'default' in kwargs:
-            default = kwargs['default']
-            del kwargs['default']
-        try:
-            return ConfigParser.SafeConfigParser.get(self, section, option,
-                                                     **kwargs)
-        except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
-            if default is not None:
-                return default
-            else:
-                raise
-
-    def getboolean(self, section, option, **kwargs):
-        """ convenience method for getting boolean config items """
-        default = None
-        if 'default' in kwargs:
-            default = kwargs['default']
-            del kwargs['default']
-        try:
-            return ConfigParser.SafeConfigParser.getboolean(self, section,
-                                                            option, **kwargs)
-        except (ConfigParser.NoSectionError, ConfigParser.NoOptionError,
-                ValueError):
-            if default is not None:
-                return default
-            else:
-                raise
-
-    @property
-    def loaded(self):
-        if os.path.exists(self.name):
-            return self.name in self.read_files
-        else:
-            return True
-