diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-09-01 11:03:38 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-09-01 11:03:38 -0500 |
| commit | cc9237d2be14c96201ea2410cfac21ec34caf8e6 (patch) | |
| tree | f74d7a973098e4b8076fa65469c5b6474e6583f6 /src/lib/Bcfg2/Server/Plugins/NagiosGen.py | |
| parent | f6a142aed6756449974ab38bacf98d47e29dda3e (diff) | |
| parent | 8a36d9dccc6c4aed460763fb20083877c77a34cd (diff) | |
| download | bcfg2-cc9237d2be14c96201ea2410cfac21ec34caf8e6.tar.gz bcfg2-cc9237d2be14c96201ea2410cfac21ec34caf8e6.tar.bz2 bcfg2-cc9237d2be14c96201ea2410cfac21ec34caf8e6.zip | |
Merge branch 'maint'
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Conflicts:
src/lib/Bcfg2/Client/Tools/__init__.py
src/lib/Bcfg2/Server/BuiltinCore.py
src/lib/Bcfg2/Server/Plugins/Metadata.py
src/lib/Bcfg2/Server/Plugins/NagiosGen.py
src/lib/Bcfg2/Server/Plugins/Probes.py
src/lib/Bcfg2/Server/SSLServer.py
tools/README
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/NagiosGen.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/NagiosGen.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/NagiosGen.py b/src/lib/Bcfg2/Server/Plugins/NagiosGen.py index c807d51f4..a27664215 100644 --- a/src/lib/Bcfg2/Server/Plugins/NagiosGen.py +++ b/src/lib/Bcfg2/Server/Plugins/NagiosGen.py @@ -21,9 +21,9 @@ class NagiosGen(Plugin, Generator): self.config = \ StructFile(os.path.join(self.data, 'config.xml'), should_monitor=True, create=self.name) - self.Entries = {'Path': - {'/etc/nagiosgen.status': self.createhostconfig, - '/etc/nagios/conf.d/bcfg2.cfg': self.createserverconfig}} + self.Entries = { + 'Path': {'/etc/nagiosgen.status': self.createhostconfig, + '/etc/nagios/conf.d/bcfg2.cfg': self.createserverconfig}} self.client_attrib = {'encoding': 'ascii', 'owner': 'root', |