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

kunsi-pleroma-cybert-media #32

Merged
kunsi merged 16 commits from kunsi-pleroma-cybert-media into main 2021-02-20 21:07:14 +00:00
Conversation 0 Commits 16 Files changed 20 +4 -9
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ad5c8cc0ab - Show all commits

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,