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
2 changed files with 4 additions and 9 deletions
Showing only changes of commit ad5c8cc0ab - Show all commits

View file

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

View file

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