diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2003-08-17 20:47:00 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2003-08-17 20:47:00 +0000 |
| commit | 8d7aef07b2ed6a14ab59d30687c9cdd2a7522cc8 (patch) | |
| tree | 4132bcdd1a0be2f13d86f5226dd44ef525b8a85e /amavis | |
| parent | 874f2913c0dc6c001449058411b8f0a4a889e0c3 (diff) | |
We love spam.police@ as well (hopefully avoids mail loops due to rejection by remote amavis filter.
Diffstat (limited to 'amavis')
| -rw-r--r-- | amavis/amavisd.conf.addon | 19 | ||||
| -rw-r--r-- | amavis/amavisd.conf.addon.in | 3 |
2 files changed, 12 insertions, 10 deletions
diff --git a/amavis/amavisd.conf.addon b/amavis/amavisd.conf.addon index 3f1f5eb..de63629 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.20 2003-07-21 14:09:35 jonas Exp $ +# $Id: amavisd.conf.addon,v 1.21 2003-08-17 20:47:00 jonas Exp $ # # AMaViS configuration file addon (Debian package "amavisd-new") # @@ -54,6 +54,7 @@ map { $virus_lovers{lc($_)}=1; } (qw( map { $spam_lovers{lc($_)}=1; } (qw( postmaster@ spamalert@ + spam.police@ )); $virus_admin = { @@ -112,10 +113,6 @@ $virus_admin = { '.minard.dk' => 'virusalert@mail.bitbase.dk', '.resolution.dk' => 'virusalert@mail.bitbase.dk', '.sebastianw.dk' => 'virusalert@mail.bitbase.dk', - '.idaskolen.dk' => 'virusalert@mail.idraetsdaghojskolen.dk', - '.idraetsdaghojskolen.dk' => 'virusalert@mail.idraetsdaghojskolen.dk', - '.haakansson.com' => 'virusalert@haakansson.com', - '.shared.dk' => 'virusalert@shared.dk', '..conduct.dk' => 'virusalert@mail.conduct.dk', '.adakrem.dk' => 'virusalert@mail.conduct.dk', '.klubien.com' => 'virusalert@mail.conduct.dk', @@ -124,6 +121,8 @@ $virus_admin = { '.rgg.dk' => 'virusalert@mail.conduct.dk', '.klubien.dk' => 'virusalert@mail.conduct.dk', '.vesterbrogade50.dk' => 'virusalert@mail.conduct.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', @@ -145,6 +144,8 @@ $virus_admin = { '.simba-ngoma.com' => 'virusalert@mail.107b.dk', '.shakin.dk' => 'virusalert@mail.107b.dk', '.plastographique.com' => 'virusalert@mail.107b.dk', + '.idaskolen.dk' => 'virusalert@mail.idraetsdaghojskolen.dk', + '.idraetsdaghojskolen.dk' => 'virusalert@mail.idraetsdaghojskolen.dk', '.' => "virusalert\@$mydomain", }; @@ -204,10 +205,6 @@ $spam_admin = { '.minard.dk' => 'spamalert@mail.bitbase.dk', '.resolution.dk' => 'spamalert@mail.bitbase.dk', '.sebastianw.dk' => 'spamalert@mail.bitbase.dk', - '.idaskolen.dk' => 'spamalert@mail.idraetsdaghojskolen.dk', - '.idraetsdaghojskolen.dk' => 'spamalert@mail.idraetsdaghojskolen.dk', - '.haakansson.com' => 'spamalert@haakansson.com', - '.shared.dk' => 'spamalert@shared.dk', '..conduct.dk' => 'spamalert@mail.conduct.dk', '.adakrem.dk' => 'spamalert@mail.conduct.dk', '.klubien.com' => 'spamalert@mail.conduct.dk', @@ -216,6 +213,8 @@ $spam_admin = { '.rgg.dk' => 'spamalert@mail.conduct.dk', '.klubien.dk' => 'spamalert@mail.conduct.dk', '.vesterbrogade50.dk' => 'spamalert@mail.conduct.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', @@ -237,5 +236,7 @@ $spam_admin = { '.simba-ngoma.com' => 'spamalert@mail.107b.dk', '.shakin.dk' => 'spamalert@mail.107b.dk', '.plastographique.com' => 'spamalert@mail.107b.dk', + '.idaskolen.dk' => 'spamalert@mail.idraetsdaghojskolen.dk', + '.idraetsdaghojskolen.dk' => 'spamalert@mail.idraetsdaghojskolen.dk', '.' => "spamalert\@$mydomain", }; diff --git a/amavis/amavisd.conf.addon.in b/amavis/amavisd.conf.addon.in index 22dc374..b5040cd 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.5 2003-07-20 20:11:15 jonas Exp $ +# $Id: amavisd.conf.addon.in,v 1.6 2003-08-17 20:47:00 jonas Exp $ # # AMaViS configuration file addon (Debian package "amavisd-new") # @@ -52,4 +52,5 @@ map { $virus_lovers{lc($_)}=1; } (qw( map { $spam_lovers{lc($_)}=1; } (qw( postmaster@ spamalert@ + spam.police@ )); |