diff options
Diffstat (limited to 'amavis')
| -rw-r--r-- | amavis/amavisd.conf.addon | 66 | ||||
| -rw-r--r-- | amavis/amavisd.conf.addon.in | 6 |
2 files changed, 40 insertions, 32 deletions
diff --git a/amavis/amavisd.conf.addon b/amavis/amavisd.conf.addon index a61da3e..ff57fad 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.17 2003-07-19 01:34:54 jonas Exp $ +# $Id: amavisd.conf.addon,v 1.18 2003-07-20 20:11:15 jonas Exp $ # # AMaViS configuration file addon (Debian package "amavisd-new") # @@ -43,6 +43,10 @@ if ( -f $local_domain_file ) { $spam_admin = "spamalert\@$mydomain"; +$mailfrom_notify_admin = "virusalert\@$mydomain"; +$mailfrom_notify_recip = "virusalert\@$mydomain"; +$mailfrom_notify_spamadmin = "spam.police\@$mydomain"; + map { $virus_lovers{lc($_)}=1; } (qw( postmaster@ virusalert@ @@ -95,21 +99,6 @@ $virus_admin = { '.macronald.dk' => 'virusalert@jones.dk', '.nord-utte.org' => 'virusalert@jones.dk', '.riccos.dk' => 'virusalert@jones.dk', - '.altnet.dk' => 'virusalert@mail.bitbase.dk', - '.bitbase.dk' => 'virusalert@mail.bitbase.dk', - '.gangstafilm.dk' => 'virusalert@mail.bitbase.dk', - '.icas.dk' => 'virusalert@mail.bitbase.dk', - '.patientsikkerhed.dk' => 'virusalert@mail.bitbase.dk', - '.respons.dk' => 'virusalert@mail.bitbase.dk', - '.taekkemand.net' => 'virusalert@mail.bitbase.dk', - '.ascii33.com' => 'virusalert@mail.bitbase.dk', - '.dekadentfilm.dk' => 'virusalert@mail.bitbase.dk', - '.hcfotografi.dk' => 'virusalert@mail.bitbase.dk', - '.minard.dk' => 'virusalert@mail.bitbase.dk', - '.resolution.dk' => 'virusalert@mail.bitbase.dk', - '.sebastianw.dk' => 'virusalert@mail.bitbase.dk', - '.haakansson.com' => 'virusalert@haakansson.com', - '.shared.dk' => 'virusalert@shared.dk', '.107b.dk' => 'virusalert@mail.107b.dk', '.fidse.org' => 'virusalert@mail.107b.dk', '.komponent.dk' => 'virusalert@mail.107b.dk', @@ -131,6 +120,21 @@ $virus_admin = { '.simba-ngoma.com' => 'virusalert@mail.107b.dk', '.shakin.dk' => 'virusalert@mail.107b.dk', '.plastographique.com' => 'virusalert@mail.107b.dk', + '.haakansson.com' => 'virusalert@haakansson.com', + '.shared.dk' => 'virusalert@shared.dk', + '.altnet.dk' => 'virusalert@mail.bitbase.dk', + '.bitbase.dk' => 'virusalert@mail.bitbase.dk', + '.gangstafilm.dk' => 'virusalert@mail.bitbase.dk', + '.icas.dk' => 'virusalert@mail.bitbase.dk', + '.patientsikkerhed.dk' => 'virusalert@mail.bitbase.dk', + '.respons.dk' => 'virusalert@mail.bitbase.dk', + '.taekkemand.net' => 'virusalert@mail.bitbase.dk', + '.ascii33.com' => 'virusalert@mail.bitbase.dk', + '.dekadentfilm.dk' => 'virusalert@mail.bitbase.dk', + '.hcfotografi.dk' => 'virusalert@mail.bitbase.dk', + '.minard.dk' => 'virusalert@mail.bitbase.dk', + '.resolution.dk' => 'virusalert@mail.bitbase.dk', + '.sebastianw.dk' => 'virusalert@mail.bitbase.dk', '.' => "virusalert\@$mydomain", }; @@ -177,21 +181,6 @@ $spam_admin = { '.macronald.dk' => 'spamalert@jones.dk', '.nord-utte.org' => 'spamalert@jones.dk', '.riccos.dk' => 'spamalert@jones.dk', - '.altnet.dk' => 'spamalert@mail.bitbase.dk', - '.bitbase.dk' => 'spamalert@mail.bitbase.dk', - '.gangstafilm.dk' => 'spamalert@mail.bitbase.dk', - '.icas.dk' => 'spamalert@mail.bitbase.dk', - '.patientsikkerhed.dk' => 'spamalert@mail.bitbase.dk', - '.respons.dk' => 'spamalert@mail.bitbase.dk', - '.taekkemand.net' => 'spamalert@mail.bitbase.dk', - '.ascii33.com' => 'spamalert@mail.bitbase.dk', - '.dekadentfilm.dk' => 'spamalert@mail.bitbase.dk', - '.hcfotografi.dk' => 'spamalert@mail.bitbase.dk', - '.minard.dk' => 'spamalert@mail.bitbase.dk', - '.resolution.dk' => 'spamalert@mail.bitbase.dk', - '.sebastianw.dk' => 'spamalert@mail.bitbase.dk', - '.haakansson.com' => 'spamalert@haakansson.com', - '.shared.dk' => 'spamalert@shared.dk', '.107b.dk' => 'spamalert@mail.107b.dk', '.fidse.org' => 'spamalert@mail.107b.dk', '.komponent.dk' => 'spamalert@mail.107b.dk', @@ -213,5 +202,20 @@ $spam_admin = { '.simba-ngoma.com' => 'spamalert@mail.107b.dk', '.shakin.dk' => 'spamalert@mail.107b.dk', '.plastographique.com' => 'spamalert@mail.107b.dk', + '.haakansson.com' => 'spamalert@haakansson.com', + '.shared.dk' => 'spamalert@shared.dk', + '.altnet.dk' => 'spamalert@mail.bitbase.dk', + '.bitbase.dk' => 'spamalert@mail.bitbase.dk', + '.gangstafilm.dk' => 'spamalert@mail.bitbase.dk', + '.icas.dk' => 'spamalert@mail.bitbase.dk', + '.patientsikkerhed.dk' => 'spamalert@mail.bitbase.dk', + '.respons.dk' => 'spamalert@mail.bitbase.dk', + '.taekkemand.net' => 'spamalert@mail.bitbase.dk', + '.ascii33.com' => 'spamalert@mail.bitbase.dk', + '.dekadentfilm.dk' => 'spamalert@mail.bitbase.dk', + '.hcfotografi.dk' => 'spamalert@mail.bitbase.dk', + '.minard.dk' => 'spamalert@mail.bitbase.dk', + '.resolution.dk' => 'spamalert@mail.bitbase.dk', + '.sebastianw.dk' => 'spamalert@mail.bitbase.dk', '.' => "spamalert\@$mydomain", }; diff --git a/amavis/amavisd.conf.addon.in b/amavis/amavisd.conf.addon.in index 8d2187f..22dc374 100644 --- a/amavis/amavisd.conf.addon.in +++ b/amavis/amavisd.conf.addon.in @@ -3,7 +3,7 @@ # /etc/local-COMMON/amavisd.conf.addon # Copyright 2002 Jonas Smedegaard <dr@jones.dk> # -# $Id: amavisd.conf.addon.in,v 1.4 2003-07-15 14:33:44 jonas Exp $ +# $Id: amavisd.conf.addon.in,v 1.5 2003-07-20 20:11:15 jonas Exp $ # # AMaViS configuration file addon (Debian package "amavisd-new") # @@ -41,6 +41,10 @@ if ( -f $local_domain_file ) { $spam_admin = "spamalert\@$mydomain"; +$mailfrom_notify_admin = "virusalert\@$mydomain"; +$mailfrom_notify_recip = "virusalert\@$mydomain"; +$mailfrom_notify_spamadmin = "spam.police\@$mydomain"; + map { $virus_lovers{lc($_)}=1; } (qw( postmaster@ virusalert@ |