diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-07 08:26:39 -0500 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-07 08:26:39 -0500 |
commit | 7db65d41386768a5081c34c16db17e82b96a5b7a (patch) | |
tree | 07ff91016b461afb44ced8247bafcba2d1f21ae2 /src/lib/Bcfg2/Server/Plugins/NagiosGen.py | |
parent | 65caf3f586d7985d88652c73e7b214ba3e40eac2 (diff) | |
download | bcfg2-7db65d41386768a5081c34c16db17e82b96a5b7a.tar.gz bcfg2-7db65d41386768a5081c34c16db17e82b96a5b7a.tar.bz2 bcfg2-7db65d41386768a5081c34c16db17e82b96a5b7a.zip |
made XInlcude and Encryption support more consistent
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/NagiosGen.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/NagiosGen.py | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/NagiosGen.py b/src/lib/Bcfg2/Server/Plugins/NagiosGen.py index c377ca4ef..d5ea0cb24 100644 --- a/src/lib/Bcfg2/Server/Plugins/NagiosGen.py +++ b/src/lib/Bcfg2/Server/Plugins/NagiosGen.py @@ -5,27 +5,8 @@ import re import sys import glob import socket -import logging -import Bcfg2.Server import Bcfg2.Server.Plugin -LOGGER = logging.getLogger(__name__) - - -class NagiosGenConfig(Bcfg2.Server.Plugin.StructFile): - """ NagiosGen config file handler """ - encryption = False - - def __init__(self, filename): - # create config.xml if missing - if not os.path.exists(filename): - LOGGER.warning("NagiosGen: %s missing. " - "Creating empty one for you." % filename) - open(filename, "w").write("<NagiosGen/>") - - Bcfg2.Server.Plugin.StructFile.__init__(self, filename, - should_monitor=True) - class NagiosGen(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.Generator): @@ -37,7 +18,10 @@ class NagiosGen(Bcfg2.Server.Plugin.Plugin, def __init__(self, core, datastore): Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore) Bcfg2.Server.Plugin.Generator.__init__(self) - self.config = NagiosGenConfig(os.path.join(self.data, 'config.xml')) + self.config = \ + Bcfg2.Server.Plugin.StructFile(os.path.join(self.data, + 'config.xml'), + should_monitor=True) self.Entries = {'Path': {'/etc/nagiosgen.status': self.createhostconfig, '/etc/nagios/nagiosgen.cfg': self.createserverconfig}} |