diff options
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/SEModules.py | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/SEModules.py b/src/lib/Bcfg2/Server/Plugins/SEModules.py index 324c2309f..ce75be044 100644 --- a/src/lib/Bcfg2/Server/Plugins/SEModules.py +++ b/src/lib/Bcfg2/Server/Plugins/SEModules.py @@ -20,7 +20,7 @@ class SEModules(Bcfg2.Server.Plugin.GroupSpool): entry_type = 'SELinux' experimental = True - def _get_module_name(self, entry): + def _get_module_filename(self, entry): """ GroupSpool stores entries as /foo.pp, but we want people to be able to specify module entries as name='foo' or name='foo.pp', so we put this abstraction in between """ @@ -28,17 +28,32 @@ class SEModules(Bcfg2.Server.Plugin.GroupSpool): name = entry.get("name") else: name = entry.get("name") + ".pp" + return "/" + name + + def _get_module_name(self, entry): + """ On the client we do most of our logic on just the module + name, but we want people to be able to specify module entries + as name='foo' or name='foo.pp', so we put this abstraction in + between""" + if entry.get("name").endswith(".pp"): + name = entry.get("name")[:-3] + else: + name = entry.get("name") return name.lstrip("/") def HandlesEntry(self, entry, metadata): + print "entry.tag = %s, self.Entries = %s" % (entry.tag, self.Entries.keys()) + print "entry type = %s" % entry.get('type') if entry.tag in self.Entries and entry.get('type') == 'module': - return "/" + self._get_module_name(entry) in self.Entries[entry.tag] + print " filename = %s, self.Entries[%s] = %s" % (self._get_module_filename(entry), entry.tag, self.Entries[entry.tag].keys()) + return self._get_module_filename(entry) in self.Entries[entry.tag] return Bcfg2.Server.Plugin.GroupSpool.HandlesEntry(self, entry, metadata) def HandleEntry(self, entry, metadata): entry.set("name", self._get_module_name(entry)) - return self.Entries[entry.tag]["/" + entry.get("name")](entry, metadata) + bind = self.Entries[entry.tag][self._get_module_filename(entry)] + return bind(entry, metadata) def add_entry(self, event): self.filename_pattern = \ |