diff options
author | Jonas Smedegaard <dr@jones.dk> | 2004-07-01 00:48:13 +0000 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2004-07-01 00:48:13 +0000 |
commit | 79dffbd47e0c09ac9db74c2944d370ca155a926d (patch) | |
tree | f0423cc0783ace81c6999f8a2a55d1a7ea1a25c9 /amavis | |
parent | 5e1547edf2904abbd27d45663add62dd414a318b (diff) |
Make sure to use non-local SpamAssassin tests.
Diffstat (limited to 'amavis')
-rw-r--r-- | amavis/amavisd.conf.addon | 6 | ||||
-rw-r--r-- | amavis/amavisd.conf.addon.in | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/amavis/amavisd.conf.addon b/amavis/amavisd.conf.addon index 7e9ae4f..a125512 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.30 2004-04-06 19:18:11 jonas Exp $ +# $Id: amavisd.conf.addon,v 1.31 2004-07-01 00:48:13 jonas Exp $ # # AMaViS configuration file addon (Debian package "amavisd-new") # @@ -16,9 +16,11 @@ # do $config_file_addon or die "Error in config file $config_file_addon: $@"; # -# We use SpamAssassin >= 2.44 +# We use SpamAssassin >= 2.44 and have working Internet connection @bypass_spam_checks_acl = undef; +$sa_local_tests_only = 0; #$sa_auto_whitelist = 1; +$sa_timeout = 300; ## Let's bounce everything bad as suggested (why not bad headers per default?) # ...or let's not (yet)... diff --git a/amavis/amavisd.conf.addon.in b/amavis/amavisd.conf.addon.in index 560a69e..1319324 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.11 2004-04-06 19:18:12 jonas Exp $ +# $Id: amavisd.conf.addon.in,v 1.12 2004-07-01 00:48:13 jonas Exp $ # # AMaViS configuration file addon (Debian package "amavisd-new") # @@ -14,9 +14,11 @@ # do $config_file_addon or die "Error in config file $config_file_addon: $@"; # -# We use SpamAssassin >= 2.44 +# We use SpamAssassin >= 2.44 and have working Internet connection @bypass_spam_checks_acl = undef; +$sa_local_tests_only = 0; #$sa_auto_whitelist = 1; +$sa_timeout = 300; ## Let's bounce everything bad as suggested (why not bad headers per default?) # ...or let's not (yet)... |