Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

2 bug fixes in the fasjson email aliases script

Browse source 
Signed-off-by: Stephen Coady <scoady@redhat.com>
This commit is contained in:
Stephen Coady 2021-04-08 14:45:44 +01:00 • committed by kevin
parent 5a7bf06620
commit 88b6b0e0b6
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
roles/fasjson/templates/fasjson-aliases.j2
View file

@ -2,6 +2,7 @@
import os import os
import sys import sys
import tempfile import tempfile
import subprocess
from fasjson_client import Client, errors from fasjson_client import Client, errors
@ -36,19 +37,16 @@ def gen_all_aliases():
for group in groups: for group in groups:
groupname = group['groupname'] groupname = group['groupname']
# even though there are no admins of groups anymore
# we should probably leave this here and just
# link to the sponsors list
temp.write(
f'{groupname}-administrators: {groupname}-sponsors \n'
)
sponsor_list = ','.join( sponsor_list = ','.join(
sponsor['username'] sponsor['username']
for sponsor in client.list_group_sponsors( for sponsor in client.list_group_sponsors(
groupname=groupname).result groupname=groupname).result
) )
temp.write(f"{groupname}-sponsors: {sponsor_list} \n") if sponsor_list:
temp.write(
f'{groupname}-administrators: {groupname}-sponsors \n'
)
temp.write(f"{groupname}-sponsors: {sponsor_list} \n")
member_list = ','.join( member_list = ','.join(
member['username'] member['username']
@ -56,7 +54,9 @@ def gen_all_aliases():
groupname=groupname).result groupname=groupname).result
) )
temp.write(f"{groupname}-members: {member_list} \n") if member_list:
temp.write(f"{groupname}-members: {member_list} \n")
rename(temporary_file.name, aliases_file) rename(temporary_file.name, aliases_file)
except errors.APIError as e: except errors.APIError as e:
print(f"Something went wrong querying the fasjson API. {e}", file=sys.stderr) print(f"Something went wrong querying the fasjson API. {e}", file=sys.stderr)
@ -117,8 +117,12 @@ def main():
try: try:
if not args: if not args:
gen_all_aliases() gen_all_aliases()
# call newaliases script so postfix gets updated
subprocess.check_call(['/usr/bin/newaliases'])
elif len(args) == 2 and args[0] == "update": elif len(args) == 2 and args[0] == "update":
update_user(args[1]) update_user(args[1])
# call newaliases script so postfix gets updated
subprocess.check_call(['/usr/bin/newaliases'])
else: else:
print(f"Usage: {sys.argv[0]} [update <username>]", file=sys.stderr) print(f"Usage: {sys.argv[0]} [update <username>]", file=sys.stderr)
raise RuntimeError() raise RuntimeError()