diff options
| author | Sol Jerome <solj@ices.utexas.edu> | 2009-11-19 05:25:25 +0000 |
|---|---|---|
| committer | Sol Jerome <solj@ices.utexas.edu> | 2009-11-19 05:25:25 +0000 |
| commit | ddc74a543f53d4197e990def51628f961af5b8cd (patch) | |
| tree | e432e743fff65d7342bce7e47f07a99a9ec4f899 /src/lib/Server/Plugins/NagiosGen.py | |
| parent | 18f8668b60cea58fa26ae96c81e201e321547e1a (diff) | |
| download | bcfg2-ddc74a543f53d4197e990def51628f961af5b8cd.tar.gz bcfg2-ddc74a543f53d4197e990def51628f961af5b8cd.tar.bz2 bcfg2-ddc74a543f53d4197e990def51628f961af5b8cd.zip | |
POSIX: Remove support for old-style posix entries
This commit forces the user to specify <Path> entries on the server
side while still maintaining compatibility with old clients via the
POSIXCompat plugin.
Signed-off-by: Sol Jerome <solj@ices.utexas.edu>
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5582 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Plugins/NagiosGen.py')
| -rw-r--r-- | src/lib/Server/Plugins/NagiosGen.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/lib/Server/Plugins/NagiosGen.py b/src/lib/Server/Plugins/NagiosGen.py index 82326b760..38934f090 100644 --- a/src/lib/Server/Plugins/NagiosGen.py +++ b/src/lib/Server/Plugins/NagiosGen.py @@ -29,14 +29,20 @@ 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.Entries = {'ConfigFile': + self.Entries = {'Path': {'/etc/nagiosgen.status' : self.createhostconfig, '/etc/nagios/nagiosgen.cfg': self.createserverconfig}} - self.client_attrib = {'encoding': 'ascii', 'owner':'root', \ - 'group':'root', 'perms':'0400'} - self.server_attrib = {'encoding': 'ascii', 'owner':'nagios', \ - 'group':'nagios', 'perms':'0440'} + self.client_attrib = {'encoding':'ascii', + 'owner':'root', + 'group':'root', + 'type':'file', + 'perms':'0400'} + self.server_attrib = {'encoding':'ascii', + 'owner':'nagios', + 'group':'nagios', + 'type':'file', + 'perms':'0440'} def createhostconfig(self, entry, metadata): '''Build host specific configuration file''' |