diff options
| -rw-r--r-- | src/lib/Server/Plugins/Account.py | 8 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/Cfg.py | 2 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/Hostbase.py | 2 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/SSHbase.py | 4 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/TCheetah.py | 2 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/Vhost.py | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/Server/Plugins/Account.py b/src/lib/Server/Plugins/Account.py index 86cdab9f3..8599c028a 100644 --- a/src/lib/Server/Plugins/Account.py +++ b/src/lib/Server/Plugins/Account.py @@ -34,7 +34,7 @@ class Account(Bcfg2.Server.Plugin.Plugin): fname = entry.attrib['name'].split('/')[-1] entry.text = self.repository.entries["static.%s" % (fname)].data entry.text += self.repository.entries["dyn.%s" % (fname)].data - perms = {'owner':'root', 'group':'0', 'perms':'0644'} + perms = {'owner':'root', 'group':'root', 'perms':'0644'} [entry.attrib.__setitem__(key, value) for (key, value) in perms.iteritems()] def gen_limits_cb(self, entry, metadata): @@ -43,7 +43,7 @@ class Account(Bcfg2.Server.Plugin.Plugin): superusers = self.repository.entries["superusers"].data.split() useraccess = [line.split(':') for line in self.repository.entries["useraccess"].data.split()] users = [user for (user, host) in useraccess if host == metadata.hostname.split('.')[0]] - perms = {'owner':'root', 'group':'0', 'perms':'0600'} + perms = {'owner':'root', 'group':'root', 'perms':'0600'} [entry.attrib.__setitem__(key, value) for (key, value) in perms.iteritems()] entry.text += "".join(["%s hard maxlogins 1024\n" % uname for uname in superusers + users]) if "*" not in users: @@ -63,7 +63,7 @@ class Account(Bcfg2.Server.Plugin.Plugin): entry.text = "".join([rdata["%s.key" % user].data for user \ in superusers if \ rdata.has_key("%s.key" % user)]) - perms = {'owner':'root', 'group':'0', 'perms':'0600'} + perms = {'owner':'root', 'group':'root', 'perms':'0600'} [entry.attrib.__setitem__(key, value) for (key, value) \ in perms.iteritems()] @@ -80,6 +80,6 @@ class Account(Bcfg2.Server.Plugin.Plugin): entry.text = self.repository.entries['static.sudoers'].data entry.text += "".join(["%s ALL=(ALL) ALL\n" % uname \ for uname in superusers]) - perms = {'owner':'root', 'group':'0', 'perms':'0440'} + perms = {'owner':'root', 'group':'root', 'perms':'0440'} [entry.attrib.__setitem__(key, value) for (key, value) \ in perms.iteritems()] diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py index 1a995183e..afce2c489 100644 --- a/src/lib/Server/Plugins/Cfg.py +++ b/src/lib/Server/Plugins/Cfg.py @@ -82,7 +82,7 @@ class ConfigFileEntry(object): self.path = path self.repopath = repopath self.fragments = [] - self.metadata = {'encoding': 'ascii', 'owner':'root', 'group':'0', 'perms':'0644'} + self.metadata = {'encoding': 'ascii', 'owner':'root', 'group':'root', 'perms':'0644'} self.paranoid = False self.interpolate = False diff --git a/src/lib/Server/Plugins/Hostbase.py b/src/lib/Server/Plugins/Hostbase.py index 83ec6d0b0..dcd77f16a 100644 --- a/src/lib/Server/Plugins/Hostbase.py +++ b/src/lib/Server/Plugins/Hostbase.py @@ -80,7 +80,7 @@ class Hostbase(Plugin): fname = entry.get('name').split('/')[-1] if not self.filedata.has_key(fname): raise PluginExecutionError - perms = {'owner':'root', 'group':'0', 'perms':'644'} + perms = {'owner':'root', 'group':'root', 'perms':'644'} [entry.attrib.__setitem__(key, value) for (key, value) in perms.iteritems()] entry.text = self.filedata[fname] diff --git a/src/lib/Server/Plugins/SSHbase.py b/src/lib/Server/Plugins/SSHbase.py index 4bf8909de..41b58da20 100644 --- a/src/lib/Server/Plugins/SSHbase.py +++ b/src/lib/Server/Plugins/SSHbase.py @@ -130,7 +130,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.DirectoryBacked): for hostkey in hostkeys: entry.text += "localhost,localhost.localdomain,127.0.0.1 %s" % ( self.entries[hostkey].data) - permdata = {'owner':'root', 'group':'0', 'perms':'0644'} + permdata = {'owner':'root', 'group':'root', 'perms':'0644'} [entry.attrib.__setitem__(key, permdata[key]) for key in permdata] def build_hk(self, entry, metadata): @@ -143,7 +143,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.DirectoryBacked): self.logger.error("%s still not registered" % filename) raise Bcfg2.Server.Plugin.PluginExecutionError keydata = self.entries[filename].data - permdata = {'owner':'root', 'group':'0'} + permdata = {'owner':'root', 'group':'root'} permdata['perms'] = '0600' if entry.get('name')[-4:] == '.pub': permdata['perms'] = '0644' diff --git a/src/lib/Server/Plugins/TCheetah.py b/src/lib/Server/Plugins/TCheetah.py index ec31a66b9..582d4213f 100644 --- a/src/lib/Server/Plugins/TCheetah.py +++ b/src/lib/Server/Plugins/TCheetah.py @@ -15,7 +15,7 @@ class TemplateFile: self.name = name self.properties = properties self.states = {'template': False, 'info': False} - self.metadata = {'owner': 'root', 'group': '0', 'perms': '644'} + self.metadata = {'owner': 'root', 'group': 'root', 'perms': '644'} def HandleEvent(self, event): '''Handle all fs events for this template''' diff --git a/src/lib/Server/Plugins/Vhost.py b/src/lib/Server/Plugins/Vhost.py index 56b012aa4..5c38cd19e 100644 --- a/src/lib/Server/Plugins/Vhost.py +++ b/src/lib/Server/Plugins/Vhost.py @@ -69,7 +69,7 @@ class VhostFile(SingleXMLFileBacked): entry.text = 'NO_START=0\n' else: entry.text = 'NO_START=1\n' - perms = {'owner':'root', 'group':'0', 'perms':'0644'} + perms = {'owner':'root', 'group':'root', 'perms':'0644'} [entry.attrib.__setitem__(key, value) for (key, value) in perms.iteritems()] def generateApacheSvc(self, entry, metadata): @@ -99,7 +99,7 @@ class VhostFile(SingleXMLFileBacked): line = line.replace("XXchoiceXX", choice) config += line entry.text = base64.encodestring(config) - perms = {'owner':'root', 'group':'0', 'perms':'0644', 'encoding':'base64'} + perms = {'owner':'root', 'group':'root', 'perms':'0644', 'encoding':'base64'} [entry.attrib.__setitem__(key, value) for (key, value) in perms.iteritems()] class Vhost(Plugin): |