diff options
Diffstat (limited to 'generators')
| -rw-r--r-- | generators/account.py | 9 | ||||
| -rw-r--r-- | generators/servicemgr.py | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/generators/account.py b/generators/account.py index 760725a0b..b3f74beac 100644 --- a/generators/account.py +++ b/generators/account.py @@ -8,11 +8,6 @@ class account(Generator): __name__ = 'account' __version__ = '$Id$' __author__ = 'bcfg-dev@mcs.anl.gov' - __provides__ = {'ConfigFile':{'/etc/passwd':"GenFromYP", - '/etc/group':"GenFromYP", - '/etc/security/limits.conf':"GenLimits", - '/root/.ssh/authorized_keys':"GenRootKeys"}} - __doc__ = '''This module generates account config files, based on an internal data repo: static.(passwd|group|limits.conf) -> static entries dyn.(passwd|group) -> dynamic entries (usually acquired from yp) @@ -24,6 +19,10 @@ class account(Generator): def __setup__(self): self.repository = DirectoryBacked(self.data) self.ssh = DirectoryBacked("%s/ssh"%(self.data)) + self.__provides__ = {'ConfigFile':{'/etc/passwd':self.GenFromYP, + '/etc/group':self.GenFromYP, + '/etc/security/limits.conf':self.GenLimits, + '/root/.ssh/authorized_keys':self.GenRootKeys}} def GenFromYP(self,filename,client): fname = filename.split('/')[-1] diff --git a/generators/servicemgr.py b/generators/servicemgr.py index e263b3961..40c4ffc47 100644 --- a/generators/servicemgr.py +++ b/generators/servicemgr.py @@ -12,7 +12,7 @@ class servicemgr(Generator): __provides__ = {'Service':{'sshd':'GetService'}} - def GetService(self,name,client): + def GetService(self,name,metadata): # for now sshd is on if name == 'sshd': return Service('sshd','chkconfig','on','global') |