diff options
| -rw-r--r-- | ChangeLog | 63 | ||||
| -rw-r--r-- | amavis/amavisd.conf.addon | 50 |
2 files changed, 79 insertions, 34 deletions
@@ -9,6 +9,69 @@ -- +2003-06-11 17:46 Jonas Smedegaard <dr@jones.dk> + + * postfix/postfix.sh: + + A couple of AMaViS tweaks. + +2003-06-11 08:53 Jonas Smedegaard <dr@jones.dk> + + * logcheck/violations.ignore.d/: local, temp: + + Temporarily ignore another samba dropped-connection error. + +2003-06-10 08:25 Jonas Smedegaard <dr@jones.dk> + + * bind/BITBASE/jones.dk: + + Add ie.jones.dk (sponsored KaosPilot project). + +2003-06-05 11:08 Jonas Smedegaard <dr@jones.dk> + + * logcheck/: ignore.d.server/local, ignore.d.workstation/local, + violations.ignore.d/local, violations.ignore.d/netatalk.changes: + + Correct non-fatal netatalk timout error. + +2003-06-03 13:22 Jonas Smedegaard <dr@jones.dk> + + * bind/: named_CONDUCT_pri.conf, CONDUCT/CONDUCT-bitbasemail, + CONDUCT/CONDUCT-nomail: + + Use CONDUCT-bitbasemail for adakrem.dk, and CONDUCT-nomail for biks.dk. + +2003-06-02 20:08 Jonas Smedegaard <dr@jones.dk> + + * bind/: named_BITBASE_pri.conf, named_BITBASE_sec.conf: + + Add new (pending) BITBASE domain 40watt.dk. + +2003-06-02 19:44 Jonas Smedegaard <dr@jones.dk> + + * bind/: named_BITBASE_pri.conf, named_BITBASE_sec.conf: + + Drop domains faellesskab.dk, faellesskabet.dk and faelleskab.dk. + +2003-06-01 21:35 Jonas Smedegaard <dr@jones.dk> + + * bind/named_CONDUCT_pri.conf: + + Really drop unused ns.klubien.dk and use plain CONDUCT instead. + +2003-06-01 21:33 Jonas Smedegaard <dr@jones.dk> + + * bind/: named_BITBASE_pri.conf, named_BITBASE_sec.conf, + named_CONDUCT_pri.conf, named_CONDUCT_sec.conf, BITBASE/klubien.dk: + + Move klubien.dk, klubien.com, v50.dk and vesterbrogade50.dk from BITBASE to CONDUCT. Drop unused ns.klubien.dk and use plain CONDUCT instead. + +2003-06-01 18:39 Jonas Smedegaard <dr@jones.dk> + + * ChangeLog: + + Update ChangeLog. + 2003-06-01 18:36 Jonas Smedegaard <dr@jones.dk> * postfix/postfix.sh: 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@ )); |