cronekorkn/bundlewrap
1
0
Fork 0
Code Issues Pull requests 8 Projects Releases Wiki Activity

wip

Browse source
This commit is contained in:
mwiegand 2021-06-17 00:29:36 +02:00
parent 7ffde9de18
commit 8fab376959
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
bundles/opendkim/items.py
View file

@ -52,29 +52,29 @@ for domain in node.metadata.get('opendkim/domains'):
} }
files[f'/etc/opendkim/keys/{domain}/mail.private'] = { files[f'/etc/opendkim/keys/{domain}/mail.private'] = {
**file_attributes, **file_attributes,
'content_type': 'any', 'content': node.metadata.get(f'opendkim/keys/{domain}/private'),
}
files[f'/etc/opendkim/keys/{domain}/mail.txt'] = {
**file_attributes,
'content_type': 'any',
}
actions[f'generate_{domain}_dkim_key'] = {
'command': (
f'sudo --user opendkim'
f' opendkim-genkey'
f' --selector=mail'
f' --directory=/etc/opendkim/keys/{domain}'
f' --domain={domain}'
),
'unless': f'test -f /etc/opendkim/keys/{domain}/mail.private',
'needs': [
'svc_systemd:opendkim',
f'directory:/etc/opendkim/keys/{domain}',
],
'triggers': [
'svc_systemd:opendkim:restart',
],
} }
# files[f'/etc/opendkim/keys/{domain}/mail.txt'] = {
# **file_attributes,
# 'content_type': 'any',
# }
# actions[f'generate_{domain}_dkim_key'] = {
# 'command': (
# f'sudo --user opendkim'
# f' opendkim-genkey'
# f' --selector=mail'
# f' --directory=/etc/opendkim/keys/{domain}'
# f' --domain={domain}'
# ),
# 'unless': f'test -f /etc/opendkim/keys/{domain}/mail.private',
# 'needs': [
# 'svc_systemd:opendkim',
# f'directory:/etc/opendkim/keys/{domain}',
# ],
# 'triggers': [
# 'svc_systemd:opendkim:restart',
# ],
# }
svc_systemd['opendkim'] = { svc_systemd['opendkim'] = {
'needs': [ 'needs': [