From ca9f5ab9f71a08bfe70f0ee9d38824dc58998e55 Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Fri, 2 Mar 2018 11:59:56 +0100 Subject: [PATCH] - adjusted amavis config for gentoo, fixes #4925 --- install/dist/tpl/gentoo/amavisd-ispconfig.conf.master | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/install/dist/tpl/gentoo/amavisd-ispconfig.conf.master b/install/dist/tpl/gentoo/amavisd-ispconfig.conf.master index 88a32b4636..5e1c8ebba6 100644 --- a/install/dist/tpl/gentoo/amavisd-ispconfig.conf.master +++ b/install/dist/tpl/gentoo/amavisd-ispconfig.conf.master @@ -55,7 +55,7 @@ $sql_select_policy = $sql_select_white_black_list = 'SELECT wb FROM spamfilter_wblist'. - ' WHERE (spamfilter_wblist.rid=?) AND (spamfilter_wblist.email IN (%k))' . + ' WHERE (spamfilter_wblist.rid=?) AND (spamfilter_wblist.email IN (%k)) AND (spamfilter_wblist.active="y")' . ' ORDER BY spamfilter_wblist.priority DESC'; # @@ -112,9 +112,10 @@ $policy_bank{'ORIGINATING'} = { # Allow SMTP access from IPs in @inet_acl to amvisd SMTP Port @inet_acl = qw( 127.0.0.1 [::1] 192.168.0.0/16 ); -$signed_header_fields{'received'} = 0; # turn off signing of Received +# DKIM $enable_dkim_verification = 1; -$enable_dkim_signing = 1; +$enable_dkim_signing = 1; # load DKIM signing code +$signed_header_fields{'received'} = 0; # turn off signing of Received @dkim_signature_options_bysender_maps = ( { '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } } ); -- GitLab