diff options
Diffstat (limited to 'amavis/amavisd.conf.addon')
-rw-r--r-- | amavis/amavisd.conf.addon | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/amavis/amavisd.conf.addon b/amavis/amavisd.conf.addon index 899ea7b..ee7e79f 100644 --- a/amavis/amavisd.conf.addon +++ b/amavis/amavisd.conf.addon @@ -3,7 +3,7 @@ # /etc/local-COMMON/amavisd.conf.addon # Copyright 2002-2007 Jonas Smedegaard <dr@jones.dk> # -# $Id: amavisd.conf.addon,v 1.48 2007-09-25 11:49:36 jonas Exp $ +# $Id: amavisd.conf.addon,v 1.49 2007-09-25 12:22:10 jonas Exp $ # # AMaViS configuration file addon (Debian package "amavisd-new") # @@ -14,14 +14,21 @@ # do $config_file_addon or die "Error in config file $config_file_addon: $@"; # -# We explicitly set local domains -my $local_domain_file="/etc/local-ORG/amavis/local_domains"; -if ( -f $local_domain_file ) { +# Explicitly set local domains +my $local_domains_file="/etc/local-ORG/amavis/local_domains"; +if ( -f $local_domains_file ) { @local_domains_acl = undef; - read_hash(\%local_domains, $local_domain_file); -# read_hash(\%bypass_spam_checks, $local_domain_file); + read_hash(\%local_domains, $local_domains_file); } else { - warn "Ignoring non-existing file $local_domain_file"; + warn "Ignoring non-existing file $local_domains_file"; +} + +# Avoid expensive spamscanning when MX backup +my $nonlocal_domains_file="/etc/local-ORG/amavis/nonlocal_domains"; +if ( -f $nonlocal_domains_file ) { + read_hash(\%bypass_spam_checks, $nonlocal_domains_file); +} else { + warn "Ignoring non-existing file $nonlocal_domains_file"; } # Suppress virus notifications (noone reads them anyway) |