From f29025a420f016024a090cd77aff26a2cd6346cb Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 31 Jul 2006 01:13:58 +0000 Subject: Use default spamassassin tag levels. --- amavis/amavisd.conf.addon | 12 +----------- amavis/amavisd.conf.addon.in | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) (limited to 'amavis') 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 # -# $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 # -# $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; -- cgit v1.2.3