From fc0495f13ac02169e6284065abc6afb920d4dc37 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 17 Jul 2021 16:08:42 +0200 Subject: [PATCH] bundles/rspamd: dkim key can be a string, too --- bundles/rspamd/items.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bundles/rspamd/items.py b/bundles/rspamd/items.py index 787ff3b..c72b77e 100644 --- a/bundles/rspamd/items.py +++ b/bundles/rspamd/items.py @@ -71,6 +71,8 @@ if 'dkim' in node.metadata.get('rspamd', {}): }, } + dkim_key = repo.libs.faults.ensure_fault_or_none(node.metadata['rspamd']['dkim']) + actions = { 'rspamd_assure_dkim_key_permissions': { 'command': 'chown _rspamd:_rspamd /var/lib/rspamd/dkim/*.key', @@ -81,8 +83,8 @@ if 'dkim' in node.metadata.get('rspamd', {}): }, }, 'rspamd_generate_dkim_key': { - 'command': node.metadata['rspamd']['dkim'].format_into('cd /var/lib/rspamd/dkim && /usr/bin/rspamadm dkim_keygen -s "{0}" -b 2048 -k "{0}.key" > "{0}.txt"'), - 'unless': node.metadata['rspamd']['dkim'].format_into('test -f "/var/lib/rspamd/dkim/{0}.key"'), + 'command': dkim_key.format_into('cd /var/lib/rspamd/dkim && /usr/bin/rspamadm dkim_keygen -s "{0}" -b 2048 -k "{0}.key" > "{0}.txt"'), + 'unless': dkim_key.format_into('test -f "/var/lib/rspamd/dkim/{0}.key"'), 'needs': { 'directory:/var/lib/rspamd/dkim', 'pkg_apt:rspamd',