diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2005-04-12 17:02:31 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2005-04-12 17:02:31 +0000 |
| commit | 6125616036ade2b4c59a86dfb8dffbdcf7ba7006 (patch) | |
| tree | 396a9a105578070f8a21108f887a232745916204 /amavis/amavisd.conf.addon | |
| parent | 00137be413f79f18c41980dcabd1ae70d7d68576 (diff) | |
Avoid spamchecking from local origin.
Diffstat (limited to 'amavis/amavisd.conf.addon')
| -rw-r--r-- | amavis/amavisd.conf.addon | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/amavis/amavisd.conf.addon b/amavis/amavisd.conf.addon index caf429f..dfa8326 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.32 2004-08-03 07:42:46 jonas Exp $ +# $Id: amavisd.conf.addon,v 1.33 2005-04-12 17:02:31 jonas Exp $ # # AMaViS configuration file addon (Debian package "amavisd-new") # @@ -18,6 +18,7 @@ # We use SpamAssassin >= 2.44 and have working Internet connection @bypass_spam_checks_acl = undef; +$bypass_spam_checks_acl = qw( spamalert@ spam.police@ ); $sa_local_tests_only = 0; #$sa_auto_whitelist = 1; $sa_timeout = 300; @@ -35,10 +36,11 @@ $virus_quarantine_to = 'virus-quarantine@'; $spam_quarantine_to = 'spam-quarantine@'; # We explicitly set local domains -@local_domains_acl = undef; my $local_domain_file="/etc/local-COMMON/amavis/local_domains_$mydomain"; if ( -f $local_domain_file ) { + @local_domains_acl = undef; read_hash(\%local_domains, $local_domain_file); + read_hash(\%bypass_spam_checks, $local_domain_file); } else { warn "Ignoring non-existing file $local_domain_file"; } |