diff options
| -rw-r--r-- | group_vars/all.yml | 2 | ||||
| -rw-r--r-- | roles/amavis/templates/etc/amavis/conf.d/50-user.j2 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/group_vars/all.yml b/group_vars/all.yml index 35a833a..529ebf7 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -127,7 +127,7 @@ dkim_keys: "lindstrom-aberg.se": d: lindstrom-aberg.se s: 95fea5b461191e0f6eb1a29b803c64b2 - "technopragmatics.org": + ".technopragmatics.org": d: technopragmatics.org s: d0e93eb9dc241ebf55a91eaafda43ccb "~": # catch-all, for our virtual domains 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 8563a8c..b40613e 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 | regex_replace('^.*@',''))+"'") }}, '{{ k.s }}', '/etc/amavis/dkim/{{ k.s }}:{{ k.d }}.pem'); +dkim_key({{ (x == "~") | ternary('qr/./', "'"+(x | regex_replace('^.*?([a-zA-Z0-9][a-zA-Z0-9\\-]*(?:\\.[a-zA-Z0-9][a-zA-Z0-9\\-]*)+)$','\\1'))+"'") }}, '{{ 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() %} |