From 1b20499923a9c7146e6d2782599689015ca30f40 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 12 Jul 2003 15:42:24 +0000 Subject: Only warn (not fail) if local_domains_ file not found. A few cosmetic tweaks. --- amavis/amavisd.conf.addon | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'amavis/amavisd.conf.addon') diff --git a/amavis/amavisd.conf.addon b/amavis/amavisd.conf.addon index af2fe67..70cf4e8 100644 --- a/amavis/amavisd.conf.addon +++ b/amavis/amavisd.conf.addon @@ -1,10 +1,11 @@ +#!/bin/perl ### WARNING: This file is generated automatically. ### Please edit amavisd.conf.addon.in and run mkaddon.sh # # /etc/local-COMMON/amavisd.conf.addon # Copyright 2002 Jonas Smedegaard # -# $Id: amavisd.conf.addon,v 1.10 2003-07-12 14:12:10 jonas Exp $ +# $Id: amavisd.conf.addon,v 1.11 2003-07-12 15:42:24 jonas Exp $ # # AMaViS configuration file addon (Debian package "amavisd-new") # @@ -25,7 +26,12 @@ $final_bad_header_destiny = D_BOUNCE; # We explicitly set local domains @local_domains_acl = undef; -read_hash(\%local_domains, "/etc/local-COMMON/amavis/local_domains_$mydomain"); +my $local_domain_file="/etc/local-COMMON/amavis/local_domains_$mydomain"; +if ( -f $local_domain_file ) { + read_hash(\%local_domains, $local_domain_file); +} else { + warn "Ignoring non-existing file $local_domain_file"; +} $spam_admin = "spamalert\@$mydomain"; -- cgit v1.2.3