From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Sun, 10 Jul 2016 05:02:35 -0400 Subject: [PATCH] Merge branch 'stable-3.1' --- install/tpl/amavisd_user_config.master | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/install/tpl/amavisd_user_config.master b/install/tpl/amavisd_user_config.master index f377955..8663f07 100644 --- a/install/tpl/amavisd_user_config.master +++ b/install/tpl/amavisd_user_config.master @@ -37,7 +37,7 @@ $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'; # @@ -75,10 +75,28 @@ # Set the log_level to 5 for debugging $log_level = 0; # (defaults to 0) -# DKIM +$inet_socket_port = [10024,10026]; +# :* = send to incoming Port + 1 +$forward_method = 'smtp:127.0.0.1:*'; +$notify_method = 'smtp:127.0.0.1:*'; +$interface_policy{'10026'} = 'ORIGINATING'; +$policy_bank{'ORIGINATING'} = { + originating => 1, + smtpd_discard_ehlo_keywords => ['8BITMIME'], +}; + +# IP-Addresses for internal networks => load policy MYNETS +# - requires -o smtp_send_xforward_command=yes in postfix master.cf +@mynetworks = qw(0.0.0.0/8 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 [::1] [FE80::]/10 [FEC0::]/10); + +# 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 ); + +# DKIM $enable_dkim_verification = 1; -$enable_dkim_signing = 1; # load DKIM signing code, +$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' } } ); -- Gitblit v1.9.1