kunsi/bundlewrap
1
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

bundles/postfix: only get certificate if actually needed
All checks were successful
bundlewrap/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
Franzi 2021-02-20 17:30:38 +01:00
parent 97a1b3ae85
commit ad5c8cc0ab
Signed by: kunsi
GPG key ID: 12E3D2136B818350
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bundles/letsencrypt/files/domains.txt
View file

@ -1,5 +1,3 @@
${node.metadata['hostname']}
% for domain, aliases in sorted(node.metadata.get('letsencrypt/domains', {}).items()): % for domain, aliases in sorted(node.metadata.get('letsencrypt/domains', {}).items()):
${domain} ${' '.join(sorted(aliases))} ${domain} ${' '.join(sorted(aliases))}
% endfor % endfor

11
bundles/postfix/metadata.py
View file

@ -49,7 +49,7 @@ else:
'letsencrypt/reload_after', 'letsencrypt/reload_after',
) )
def letsencrypt(metadata): def letsencrypt(metadata):
if not node.has_bundle('letsencrypt'): if not node.has_bundle('letsencrypt') or not node.has_bundle('postfixadmin'):
raise DoNotRunAgain raise DoNotRunAgain
result = { result = {
@ -58,12 +58,9 @@ def letsencrypt(metadata):
}, },
} }
myhostname = metadata.get('postfix/myhostname', None) result['domains'] = {
metadata.get('postfix/myhostname', metadata.get('hostname')): set(),
if myhostname and myhostname != metadata.get('hostname'): }
result['domains'] = {
myhostname: set(),
}
return { return {
'letsencrypt': result, 'letsencrypt': result,