diff options
author | Jonas Smedegaard <dr@jones.dk> | 2003-06-12 13:17:12 +0000 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2003-06-12 13:17:12 +0000 |
commit | 54e8a9f56ae832225cba5fcab72b1c4347ecf60d (patch) | |
tree | 463ac1eb11ad79c059885865a4602287913f1e0f /amavis | |
parent | f34e0edce02aa0213a2727100254bafeb936b3c2 (diff) |
Update ChangeLog.
Diffstat (limited to 'amavis')
-rw-r--r-- | amavis/amavisd.conf.addon | 50 |
1 files changed, 16 insertions, 34 deletions
diff --git a/amavis/amavisd.conf.addon b/amavis/amavisd.conf.addon index e983e02..f19d896 100644 --- a/amavis/amavisd.conf.addon +++ b/amavis/amavisd.conf.addon @@ -2,47 +2,29 @@ # /etc/local-COMMON/amavisd.conf.addon # Copyright 2002 Jonas Smedegaard <dr@jones.dk> # -# $Id: amavisd.conf.addon,v 1.5 2003-02-03 23:41:35 jonas Exp $ +# $Id: amavisd.conf.addon,v 1.6 2003-06-12 13:17:12 jonas Exp $ # -# Configuration file addon +# AMaViS configuration file addon (Debian package "amavisd-new") # -# Put the following lines at the end of /etc/amavisd.conf: +# Put the following lines at the end of /etc/amavis/amavisd.conf: # # my $config_file_addon="/etc/local-COMMON/amavis/amavisd.conf.addon"; # -f $config_file_addon or die "Cannot find config file $config_file_addon"; # do $config_file_addon or die "Error in config file $config_file_addon: $@"; # -map { $spam_lovers{lc($_)}=1 } (qw( - ascanius@mail.jones.dk - laila@mail.jones.dk - laurits@107b.dk - morgan@mail.jones.dk - nils@mail.jones.dk - ole@mail.jones.dk - pelle@mail.jones.dk - rosen@mail.jones.dk - ruggero@mail.jones.dk - samuel@mail.jones.dk - hap@bitbase.dk - npe@bitbase.dk - chp@bitbase.dk -)); +# We use SpamAssassin >= 2.44 +@bypass_spam_checks_acl = undef; +sa_auto_whitelist = 1; + +# We explicitly set local domains +@local_domains_acl = undef; +read_hash(\%local_domains, "/etc/local-COMMON/amavis/local_domains_$mydomain"); + +$spam_admin = "spamalert\@$mydomain"; -map { $whitelist_sender{lc($_)}=1 } (qw( - admin@computerworld.dk - christina_kb@hotmail.com - david@mir.dk - ejc04@euronet.nl - mail@sparwasserhq.de - maillist@gamemail.dk - newsletters@fastcompany.com - nils@nilsstaerk.dk - nyhedsbrev@edbpriser.dk - pj@pjgrafisk.dk - www.dancegrandprix.com@dancegrandprix.com - nyhedsbrev@nortlander.dk - Jubii_Virusbasker@list.jubii.dk - joy@martins.dk - post@gamleskole.dk +#$virus_lovers{lc('postmaster@')} = 1; +#$spam_lovers{lc('postmaster@')} = 1; +map { $virus_lovers{lc($_)}=1; $spam_lovers{lc($_)}=1; } (qw( + postmaster@ )); |