From b9a3ef486ebcde18a5ade37865ff8f397185d24f Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 24 Jul 2016 05:30:59 -0400
Subject: [PATCH] Fixed #3979 Mailbox users unable to save autoresponders
---
install/tpl/fedora_amavisd_conf.master | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/install/tpl/fedora_amavisd_conf.master b/install/tpl/fedora_amavisd_conf.master
index 2a20433..f32530c 100644
--- a/install/tpl/fedora_amavisd_conf.master
+++ b/install/tpl/fedora_amavisd_conf.master
@@ -48,14 +48,14 @@
@local_domains_maps = ( [".$mydomain"] ); # list of all local domains
-@mynetworks = qw( 127.0.0.0/8 [::1] [FE80::]/10 [FEC0::]/10
+@mynetworks = qw( 0.0.0.0/8 127.0.0.0/8 [::1] [FE80::]/10 [FEC0::]/10
10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 );
$unix_socketname = "$MYHOME/amavisd.sock"; # amavisd-release or amavis-milter
# option(s) -p overrides $inet_socket_port and $unix_socketname
-$inet_socket_port = 10024; # listen on this local TCP port(s)
-# $inet_socket_port = [10024,10026]; # listen on multiple TCP ports
+# $inet_socket_port = 10024; # listen on this local TCP port(s)
+$inet_socket_port = [10024,10026]; # listen on multiple TCP ports
$policy_bank{'MYNETS'} = { # mail originating from @mynetworks
originating => 1, # is true in MYNETS by default, but let's make it explicit
@@ -91,9 +91,9 @@
};
$sa_tag_level_deflt = 2.0; # add spam info headers if at, or above that level
-$sa_tag2_level_deflt = 6.2; # add 'spam detected' headers at that level
-$sa_kill_level_deflt = 6.9; # triggers spam evasive actions (e.g. blocks mail)
-$sa_dsn_cutoff_level = 10; # spam level beyond which a DSN is not sent
+$sa_tag2_level_deflt = 20; # add 'spam detected' headers at that level
+$sa_kill_level_deflt = 100; # triggers spam evasive actions (e.g. blocks mail)
+$sa_dsn_cutoff_level = 100; # spam level beyond which a DSN is not sent
# $sa_quarantine_cutoff_level = 25; # spam level beyond which quarantine is off
$penpals_bonus_score = 8; # (no effect without a @storage_sql_dsn database)
$penpals_threshold_high = $sa_kill_level_deflt; # don't waste time on hi spam
@@ -144,20 +144,10 @@
# OTHER MORE COMMON SETTINGS (defaults may suffice):
-# $myhostname = 'host.example.com'; # must be a fully-qualified domain name!
+$myhostname = '{hostname}';
-# $notify_method = 'smtp:[127.0.0.1]:10025';
-# $forward_method = 'smtp:[127.0.0.1]:10025'; # set to undef with milter!
-
-#$final_virus_destiny = D_DISCARD;
-#$final_banned_destiny = D_BOUNCE;
-#$final_spam_destiny = D_DISCARD;
-#$final_bad_header_destiny = D_BOUNCE;
-
-$final_virus_destiny = D_REJECT;
-$final_banned_destiny = D_REJECT;
-$final_spam_destiny = D_PASS;
-$final_bad_header_destiny = D_PASS;
+$notify_method = 'smtp:127.0.0.1:*';
+$forward_method = 'smtp:127.0.0.1:*'; # set to undef with milter!
# $os_fingerprint_method = 'p0f:127.0.0.1:2345'; # to query p0f-analyzer.pl
@@ -765,7 +755,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';
#
@@ -775,7 +765,7 @@
$final_virus_destiny = D_BOUNCE;
$final_spam_destiny = D_DISCARD;
$final_banned_destiny = D_BOUNCE;
-$final_bad_header_destiny = D_DISCARD;
+$final_bad_header_destiny = D_PASS;
#
# Disable spam and virus notifications for the admin user.
@@ -793,7 +783,12 @@
$DO_SYSLOG = 1;
$LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log)
-$log_level = 5; # (defaults to 0)
+$log_level = 0; # (defaults to 0)
+$enable_dkim_verification = 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' } } );
1; # insure a defined return
--
Gitblit v1.9.1