diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2018-12-05 15:47:34 +0100 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2018-12-05 16:24:12 +0100 |
| commit | 9722d50b9b6c5ccd81892a00bdd3023399b004fb (patch) | |
| tree | 10ff7840e4c924d51217a122ac5f4a7bcb56a476 /roles/amavis/templates/etc | |
| parent | c21b92d9b79a80a27607618666b56fbc5cd26ac8 (diff) | |
DKIM: also include the "d=" tag in key filenames, not only the "s=" tag.
While the combination of "s=" tag (selector) & "d=" tag signing domain
maps to a unique key, the selector alone doesn't necessarily.
Diffstat (limited to 'roles/amavis/templates/etc')
| -rw-r--r-- | roles/amavis/templates/etc/amavis/conf.d/50-user.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/amavis/templates/etc/amavis/conf.d/50-user.j2 b/roles/amavis/templates/etc/amavis/conf.d/50-user.j2 index f3ff416..a09c366 100644 --- a/roles/amavis/templates/etc/amavis/conf.d/50-user.j2 +++ b/roles/amavis/templates/etc/amavis/conf.d/50-user.j2 @@ -33,7 +33,7 @@ $enable_dkim_signing = 1; # Sign *all* outgoing mails with *our* key (yes, amavis complains, but this is # safe as we force our domain with the 'd' tag). {% for x,k in dkim_keys[inventory_hostname_short] | default({}) | dictsort() -%} -dkim_key({{ (x == "~") | ternary('qr/./', "'"+x+"'") }}, '{{ k.s }}', '/etc/amavis/dkim/{{ k.s }}.pem'); +dkim_key({{ (x == "~") | ternary('qr/./', "'"+x+"'") }}, '{{ k.s }}', '/etc/amavis/dkim/{{ k.s }}:{{ k.d }}.pem'); {% endfor -%} @dkim_signature_options_bysender_maps = ( {% for x,k in dkim_keys[inventory_hostname_short] | default({}) | dictsort() %} |