Aliases now work. they work a little differently then previous though I don't think it will cause any problems as long as groupName-members remains intact, which it does.
This commit is contained in:
parent
11eb97bcd4
commit
34fd2fb295
1 changed files with 8 additions and 2 deletions
|
@ -201,7 +201,7 @@ class MakeShellAccounts(BaseClient):
|
||||||
return '/sbin/nologin'
|
return '/sbin/nologin'
|
||||||
|
|
||||||
def install_aliases_txt(self):
|
def install_aliases_txt(self):
|
||||||
move(self.temp + '/aliases', '/tmp/aliases')
|
move(self.temp + '/aliases', '/etc/aliases')
|
||||||
|
|
||||||
def passwd_text(self, people=None):
|
def passwd_text(self, people=None):
|
||||||
i = 0
|
i = 0
|
||||||
|
@ -397,15 +397,21 @@ class MakeShellAccounts(BaseClient):
|
||||||
for group in self.groups:
|
for group in self.groups:
|
||||||
name = group['name']
|
name = group['name']
|
||||||
members = {}
|
members = {}
|
||||||
|
members['member'] = []
|
||||||
for membership in self.memberships[name]:
|
for membership in self.memberships[name]:
|
||||||
role_type = membership['role_type']
|
role_type = membership['role_type']
|
||||||
person = usernames[membership['person_id']]
|
person = usernames[membership['person_id']]
|
||||||
|
if role_type == 'user':
|
||||||
|
''' Legacy support '''
|
||||||
|
members['member'].append(person)
|
||||||
|
continue
|
||||||
|
members['member'].append(person)
|
||||||
try:
|
try:
|
||||||
members[role_type].append(person)
|
members[role_type].append(person)
|
||||||
except KeyError:
|
except KeyError:
|
||||||
members[role_type] = [person]
|
members[role_type] = [person]
|
||||||
for role in members:
|
for role in members:
|
||||||
print "%s-%s: %s" % (name, role, members[role])
|
email_file.write("%s-%ss: %s\n" % (name, role, ','.join(members[role])))
|
||||||
email_file.close()
|
email_file.close()
|
||||||
|
|
||||||
def enable():
|
def enable():
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue