From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Wed, 20 Apr 2016 10:58:46 -0400 Subject: [PATCH] Merge branch 'stable-3.1' --- install/tpl/amavisd_user_config.master | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/install/tpl/amavisd_user_config.master b/install/tpl/amavisd_user_config.master index 2e5a73d..c729a7c 100644 --- a/install/tpl/amavisd_user_config.master +++ b/install/tpl/amavisd_user_config.master @@ -76,19 +76,24 @@ $log_level = 0; # (defaults to 0) $inet_socket_port = [10024,10026]; -$forward_method = 'smtp:[127.0.0.1]:10025'; -$notify_method = 'smtp:[127.0.0.1]:10027'; + +# *:* = send to IP/HOST:incoming Port + 1 +$forward_method = 'smtp:*:*'; +$notify_method = 'smtp:*:*'; $interface_policy{'10026'} = 'ORIGINATING'; $policy_bank{'ORIGINATING'} = { originating => 1, smtpd_discard_ehlo_keywords => ['8BITMIME'], - forward_method => 'smtp:[127.0.0.1]:10027', }; -@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); + +# 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 $signed_header_fields{'received'} = 0; # turn off signing of Received -- Gitblit v1.9.1