From b2bc6bdeb491002d937342896294d0de8586084a Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Mon, 15 Oct 2012 14:13:05 -0500 Subject: Plugins: Update builtin plugins to use 'mode' attribute Signed-off-by: Sol Jerome --- src/lib/Bcfg2/Server/Plugins/Account.py | 8 ++++---- src/lib/Bcfg2/Server/Plugins/Cfg/CfgLegacyInfo.py | 6 +++--- src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py | 8 ++++---- src/lib/Bcfg2/Server/Plugins/Editor.py | 2 +- src/lib/Bcfg2/Server/Plugins/FileProbes.py | 4 ++-- src/lib/Bcfg2/Server/Plugins/Hostbase.py | 2 +- src/lib/Bcfg2/Server/Plugins/NagiosGen.py | 4 ++-- src/lib/Bcfg2/Server/Plugins/POSIXCompat.py | 1 - src/lib/Bcfg2/Server/Plugins/Packages/Yum.py | 4 ++-- src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | 2 +- src/lib/Bcfg2/Server/Plugins/SSHbase.py | 6 +++--- src/lib/Bcfg2/Server/Plugins/Snapshots.py | 4 ++-- src/lib/Bcfg2/Server/Plugins/Statistics.py | 4 ++-- 13 files changed, 27 insertions(+), 28 deletions(-) (limited to 'src/lib/Bcfg2') diff --git a/src/lib/Bcfg2/Server/Plugins/Account.py b/src/lib/Bcfg2/Server/Plugins/Account.py index 045379aad..fd49d3655 100644 --- a/src/lib/Bcfg2/Server/Plugins/Account.py +++ b/src/lib/Bcfg2/Server/Plugins/Account.py @@ -41,7 +41,7 @@ class Account(Bcfg2.Server.Plugin.Plugin, entry.text += self.repository.entries["dyn.%s" % (fname)].data perms = {'owner': 'root', 'group': 'root', - 'perms': '0644'} + 'mode': '0644'} [entry.attrib.__setitem__(key, value) for (key, value) in \ list(perms.items())] @@ -55,7 +55,7 @@ class Account(Bcfg2.Server.Plugin.Plugin, useraccess if host == metadata.hostname.split('.')[0]] perms = {'owner': 'root', 'group': 'root', - 'perms': '0600'} + 'mode': '0600'} [entry.attrib.__setitem__(key, value) for (key, value) in \ list(perms.items())] entry.text += "".join(["%s hard maxlogins 1024\n" % uname for uname in superusers + users]) @@ -78,7 +78,7 @@ class Account(Bcfg2.Server.Plugin.Plugin, ("%s.key" % user) in rdata]) perms = {'owner': 'root', 'group': 'root', - 'perms': '0600'} + 'mode': '0600'} [entry.attrib.__setitem__(key, value) for (key, value) \ in list(perms.items())] @@ -97,6 +97,6 @@ class Account(Bcfg2.Server.Plugin.Plugin, for uname in superusers]) perms = {'owner': 'root', 'group': 'root', - 'perms': '0440'} + 'mode': '0440'} [entry.attrib.__setitem__(key, value) for (key, value) \ in list(perms.items())] diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgLegacyInfo.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgLegacyInfo.py index 8f71c45c8..aedf579fc 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgLegacyInfo.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgLegacyInfo.py @@ -44,7 +44,7 @@ class CfgLegacyInfo(CfgInfo): dict([(key, value) for key, value in list(match.groupdict().items()) if value]) - if ('perms' in self.metadata and - len(self.metadata['perms']) == 3): - self.metadata['perms'] = "0%s" % self.metadata['perms'] + if ('mode' in self.metadata and + len(self.metadata['mode']) == 3): + self.metadata['mode'] = "0%s" % self.metadata['mode'] handle_event.__doc__ = CfgInfo.handle_event.__doc__ diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py index 82b792fe0..114cdab70 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py @@ -515,12 +515,12 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): generator = self.best_matching(metadata, self.get_handlers(metadata, CfgGenerator)) - if entry.get('perms').lower() == 'inherit': + if entry.get('mode').lower() == 'inherit': # use on-disk permissions - LOGGER.warning("Cfg: %s: Use of perms='inherit' is deprecated" % + LOGGER.warning("Cfg: %s: Use of mode='inherit' is deprecated" % entry.get("name")) fname = os.path.join(self.path, generator.name) - entry.set('perms', + entry.set('mode', str(oct(stat.S_IMODE(os.stat(fname).st_mode)))) try: return generator.get_data(entry, metadata) @@ -607,7 +607,7 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): raise Bcfg2.Server.Plugin.PluginExecutionError(msg) open(name, 'w').write(etext) self.debug_log("Wrote file %s" % name, flag=log) - badattr = [attr for attr in ['owner', 'group', 'perms'] + badattr = [attr for attr in ['owner', 'group', 'mode'] if attr in new_entry] if badattr: # check for info files and inform user of their removal diff --git a/src/lib/Bcfg2/Server/Plugins/Editor.py b/src/lib/Bcfg2/Server/Plugins/Editor.py index c0d2cfbad..f82e0f1dd 100644 --- a/src/lib/Bcfg2/Server/Plugins/Editor.py +++ b/src/lib/Bcfg2/Server/Plugins/Editor.py @@ -40,7 +40,7 @@ class EditEntrySet(Bcfg2.Server.Plugin.EntrySet): filename = entry.get('name') permdata = {'owner': 'root', 'group': 'root', - 'perms': '0644'} + 'mode': '0644'} [entry.attrib.__setitem__(key, permdata[key]) for key in permdata] entry.text = self.entries['edits'].ProcessDirectives(self.get_client_data(client)) if not entry.text: diff --git a/src/lib/Bcfg2/Server/Plugins/FileProbes.py b/src/lib/Bcfg2/Server/Plugins/FileProbes.py index f6009d8db..8bea7719c 100644 --- a/src/lib/Bcfg2/Server/Plugins/FileProbes.py +++ b/src/lib/Bcfg2/Server/Plugins/FileProbes.py @@ -41,7 +41,7 @@ data = Bcfg2.Client.XML.Element("ProbedFileData", name=path, owner=pwd.getpwuid(stat[4])[0], group=grp.getgrgid(stat[5])[0], - perms=oct(stat[0] & 4095)) + mode=oct(stat[0] & 4095)) try: data.text = b64encode(open(path).read()) except: @@ -219,7 +219,7 @@ class FileProbes(Bcfg2.Server.Plugin.Plugin, "Info", owner=data.get("owner", Bcfg2.Options.MDATA_OWNER.value), group=data.get("group", Bcfg2.Options.MDATA_GROUP.value), - perms=data.get("perms", Bcfg2.Options.MDATA_PERMS.value), + mode=data.get("mode", Bcfg2.Options.MDATA_PERMS.value), encoding=entry.get("encoding", Bcfg2.Options.ENCODING.value)) root = lxml.etree.Element("FileInfo") diff --git a/src/lib/Bcfg2/Server/Plugins/Hostbase.py b/src/lib/Bcfg2/Server/Plugins/Hostbase.py index 71cc8f881..55757e0b4 100644 --- a/src/lib/Bcfg2/Server/Plugins/Hostbase.py +++ b/src/lib/Bcfg2/Server/Plugins/Hostbase.py @@ -70,7 +70,7 @@ class Hostbase(Bcfg2.Server.Plugin.Plugin, raise PluginExecutionError perms = {'owner': 'root', 'group': 'root', - 'perms': '644'} + 'mode': '644'} [entry.attrib.__setitem__(key, value) for (key, value) in list(perms.items())] entry.text = self.filedata[fname] diff --git a/src/lib/Bcfg2/Server/Plugins/NagiosGen.py b/src/lib/Bcfg2/Server/Plugins/NagiosGen.py index d815999f0..fbad0a37b 100644 --- a/src/lib/Bcfg2/Server/Plugins/NagiosGen.py +++ b/src/lib/Bcfg2/Server/Plugins/NagiosGen.py @@ -46,12 +46,12 @@ class NagiosGen(Bcfg2.Server.Plugin.Plugin, 'owner': 'root', 'group': 'root', 'type': 'file', - 'perms': '0400'} + 'mode': '0400'} self.server_attrib = {'encoding': 'ascii', 'owner': 'nagios', 'group': 'nagios', 'type': 'file', - 'perms': '0440'} + 'mode': '0440'} def createhostconfig(self, entry, metadata): """Build host specific configuration file.""" diff --git a/src/lib/Bcfg2/Server/Plugins/POSIXCompat.py b/src/lib/Bcfg2/Server/Plugins/POSIXCompat.py index 9b9d33337..0dd42c9cb 100644 --- a/src/lib/Bcfg2/Server/Plugins/POSIXCompat.py +++ b/src/lib/Bcfg2/Server/Plugins/POSIXCompat.py @@ -8,7 +8,6 @@ import Bcfg2.Server.Plugin class POSIXCompat(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.GoalValidator): """POSIXCompat is a goal validator plugin for POSIX entries.""" - name = 'POSIXCompat' def __init__(self, core, datastore): Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore) diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py index 17decc68e..59e7a206e 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py @@ -184,7 +184,7 @@ class PulpCertificateSet(Bcfg2.Server.Plugin.EntrySet): "UTF-8") self.metadata = dict(owner='root', group='root', - perms='0644', + mode='0644', secontext='__default__', important='true', sensitive='true', @@ -520,7 +520,7 @@ class YumCollection(Collection): keypath = lxml.etree.Element("BoundPath", name=remotekey, encoding='ascii', owner='root', group='root', - type='file', perms='0644', + type='file', mode='0644', important='true') keypath.text = kdata diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py index 1c33affb3..f0ddaacbe 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py @@ -176,7 +176,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin, owner='root', group='root', type='file', - perms='0644', + mode='0644', important='true') collection = self.get_collection(metadata) diff --git a/src/lib/Bcfg2/Server/Plugins/SSHbase.py b/src/lib/Bcfg2/Server/Plugins/SSHbase.py index 0d6b47807..bab7c4a4a 100644 --- a/src/lib/Bcfg2/Server/Plugins/SSHbase.py +++ b/src/lib/Bcfg2/Server/Plugins/SSHbase.py @@ -73,9 +73,9 @@ class HostKeyEntrySet(Bcfg2.Server.Plugin.EntrySet): if encoding is not None: self.metadata['encoding'] = encoding if basename.endswith('.pub'): - self.metadata['perms'] = '0644' + self.metadata['mode'] = '0644' else: - self.metadata['perms'] = '0600' + self.metadata['mode'] = '0600' class KnownHostsEntrySet(Bcfg2.Server.Plugin.EntrySet): @@ -86,7 +86,7 @@ class KnownHostsEntrySet(Bcfg2.Server.Plugin.EntrySet): self.metadata = {'owner': 'root', 'group': 'root', 'type': 'file', - 'perms': '0644'} + 'mode': '0644'} class SSHbase(Bcfg2.Server.Plugin.Plugin, diff --git a/src/lib/Bcfg2/Server/Plugins/Snapshots.py b/src/lib/Bcfg2/Server/Plugins/Snapshots.py index 884d34e53..1956af4ad 100644 --- a/src/lib/Bcfg2/Server/Plugins/Snapshots.py +++ b/src/lib/Bcfg2/Server/Plugins/Snapshots.py @@ -18,8 +18,8 @@ datafields = { 'Package': ['version'], 'Path': ['type'], 'Service': ['status'], - 'ConfigFile': ['owner', 'group', 'perms'], - 'Directory': ['owner', 'group', 'perms'], + 'ConfigFile': ['owner', 'group', 'mode'], + 'Directory': ['owner', 'group', 'mode'], 'SymLink': ['to'], } diff --git a/src/lib/Bcfg2/Server/Plugins/Statistics.py b/src/lib/Bcfg2/Server/Plugins/Statistics.py index 748f548e1..7fae445d0 100644 --- a/src/lib/Bcfg2/Server/Plugins/Statistics.py +++ b/src/lib/Bcfg2/Server/Plugins/Statistics.py @@ -146,7 +146,7 @@ class Statistics(Bcfg2.Server.Plugin.ThreadedStatistics, owner = cfentry.get('current_owner', cfentry.get('owner')) group = cfentry.get('current_group', cfentry.get('group')) - perms = cfentry.get('current_perms', cfentry.get('perms')) + mode = cfentry.get('current_mode', cfentry.get('mode')) if cfentry.get('sensitive') in ['true', 'True']: raise Bcfg2.Server.Plugin.PluginExecutionError elif 'current_bfile' in cfentry.attrib: @@ -157,4 +157,4 @@ class Statistics(Bcfg2.Server.Plugin.ThreadedStatistics, else: contents = None - return (owner, group, perms, contents) + return (owner, group, mode, contents) -- cgit v1.2.3-1-g7c22