diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2003-08-18 01:09:10 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2003-08-18 01:09:10 +0000 |
| commit | 1e2845fca7a80391d66da7846aa6bc05dc86ca4b (patch) | |
| tree | 4e9883aabd114938a7233f5a754e20cca0aec90c /amavis | |
| parent | 1fed1dae03c22908ba42f28855b954043c043f28 (diff) | |
Bypass spam checks only, and use simpler syntax.
Diffstat (limited to 'amavis')
| -rw-r--r-- | amavis/amavisd.conf.addon | 14 | ||||
| -rwxr-xr-x | amavis/mkaddon.sh | 5 |
2 files changed, 5 insertions, 14 deletions
diff --git a/amavis/amavisd.conf.addon b/amavis/amavisd.conf.addon index 9fa476c..78f8fb3 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.24 2003-08-17 23:43:05 jonas Exp $ +# $Id: amavisd.conf.addon,v 1.25 2003-08-18 01:09:10 jonas Exp $ # # AMaViS configuration file addon (Debian package "amavisd-new") # @@ -56,32 +56,24 @@ map { $spam_lovers{lc($_)}=1; } (qw( spamalert@ )); -map { $bypass_virus_checks{lc($_)}=1; $bypass_spam_checks{lc($_)}=1; } (qw( - virusalert@haakansson.com +$bypass_spam_checks_acl = qw( spamalert@haakansson.com spam.police@haakansson.com - virusalert@homebase.dk spamalert@homebase.dk spam.police@homebase.dk - virusalert@jones.dk spamalert@jones.dk spam.police@jones.dk - virusalert@mail.107b.dk spamalert@mail.107b.dk spam.police@mail.107b.dk - virusalert@mail.bitbase.dk spamalert@mail.bitbase.dk spam.police@mail.bitbase.dk - virusalert@mail.conduct.dk spamalert@mail.conduct.dk spam.police@mail.conduct.dk - virusalert@mail.idraetsdaghojskolen.dk spamalert@mail.idraetsdaghojskolen.dk spam.police@mail.idraetsdaghojskolen.dk - virusalert@shared.dk spamalert@shared.dk spam.police@shared.dk -)); +); $virus_admin = { '.haakansson.com' => 'virusalert@haakansson.com', diff --git a/amavis/mkaddon.sh b/amavis/mkaddon.sh index 65bdc47..fe920c4 100755 --- a/amavis/mkaddon.sh +++ b/amavis/mkaddon.sh @@ -24,13 +24,12 @@ for domainfile in $domainfiles; do done echo >> "$basedir/$destfile.new" -echo "map { \$bypass_virus_checks{lc(\$_)}=1; \$bypass_spam_checks{lc(\$_)}=1; } (qw(" >> "$basedir/$destfile.new" +echo "\$bypass_spam_checks_acl = qw(" >> "$basedir/$destfile.new" for maildomain in $maildomains; do - echo " virusalert@$maildomain" >> "$basedir/$destfile.new" echo " spamalert@$maildomain" >> "$basedir/$destfile.new" echo " spam.police@$maildomain" >> "$basedir/$destfile.new" done -echo "));" >> "$basedir/$destfile.new" +echo ");" >> "$basedir/$destfile.new" for thing in virus spam; do echo >> "$basedir/$destfile.new" |