summaryrefslogtreecommitdiff
path: root/amavis
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2006-07-31 01:13:58 +0000
committerJonas Smedegaard <dr@jones.dk>2006-07-31 01:13:58 +0000
commitf29025a420f016024a090cd77aff26a2cd6346cb (patch)
tree9dcdf1a68212cacdb51b6bafdd1784188ee4048e /amavis
parent15607a61ee81d39c33c2e9082ebfd9e36107dfe9 (diff)
Use default spamassassin tag levels.
Diffstat (limited to 'amavis')
-rw-r--r--amavis/amavisd.conf.addon12
-rw-r--r--amavis/amavisd.conf.addon.in12
2 files changed, 2 insertions, 22 deletions
diff --git a/amavis/amavisd.conf.addon b/amavis/amavisd.conf.addon
index 85795eb..39e67db 100644
--- a/amavis/amavisd.conf.addon
+++ b/amavis/amavisd.conf.addon
@@ -5,7 +5,7 @@
# /etc/local-COMMON/amavisd.conf.addon
# Copyright 2002 Jonas Smedegaard <dr@jones.dk>
#
-# $Id: amavisd.conf.addon,v 1.40 2006-07-31 01:04:57 jonas Exp $
+# $Id: amavisd.conf.addon,v 1.41 2006-07-31 01:13:58 jonas Exp $
#
# AMaViS configuration file addon (Debian package "amavisd-new")
#
@@ -23,16 +23,6 @@ $sa_local_tests_only = 0;
$sa_auto_whitelist = undef;
$sa_timeout = 300;
-# Make SpamAssassin more visible
-#$sa_tag_level_deflt = -9999.9;
-#$sa_tag2_level_deflt = 1.0;
-$sa_kill_level_deflt = 8.0;
-
-## Let's bounce everything bad as suggested (why not bad headers per default?)
-# ...or let's not (yet)...
-#$final_spam_destiny = D_BOUNCE;
-#$final_bad_header_destiny = D_BOUNCE;
-
# We set Postfix timeout to 1200 for the filter, so should be safe raising it here as well
$child_timeout=15*60;
diff --git a/amavis/amavisd.conf.addon.in b/amavis/amavisd.conf.addon.in
index e9fc79c..a5d9807 100644
--- a/amavis/amavisd.conf.addon.in
+++ b/amavis/amavisd.conf.addon.in
@@ -3,7 +3,7 @@
# /etc/local-COMMON/amavisd.conf.addon
# Copyright 2002 Jonas Smedegaard <dr@jones.dk>
#
-# $Id: amavisd.conf.addon.in,v 1.16 2006-07-31 01:04:57 jonas Exp $
+# $Id: amavisd.conf.addon.in,v 1.17 2006-07-31 01:13:58 jonas Exp $
#
# AMaViS configuration file addon (Debian package "amavisd-new")
#
@@ -21,16 +21,6 @@ $sa_local_tests_only = 0;
#$sa_auto_whitelist = 1;
$sa_timeout = 300;
-# Make SpamAssassin more visible
-$sa_tag_level_deflt = -9999.9;
-$sa_tag2_level_deflt = 5.0;
-$sa_kill_level_deflt = 8.0;
-
-## Let's bounce everything bad as suggested (why not bad headers per default?)
-# ...or let's not (yet)...
-#$final_spam_destiny = D_BOUNCE;
-#$final_bad_header_destiny = D_BOUNCE;
-
# We set Postfix timeout to 1200 for the filter, so should be safe raising it here as well
$child_timeout=15*60;