From 6b9a061ae27d2cd5b6556345849db2963ae2bc1d Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 15 Jul 2003 14:20:56 +0000 Subject: Let postfix handle quarantines and alerts. --- amavis/amavisd.conf.addon | 75 ++++++++++++++++++++++++-------------------- amavis/amavisd.conf.addon.in | 15 ++++++--- 2 files changed, 52 insertions(+), 38 deletions(-) (limited to 'amavis') diff --git a/amavis/amavisd.conf.addon b/amavis/amavisd.conf.addon index e89ccd1..62db9ec 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 # -# $Id: amavisd.conf.addon,v 1.13 2003-07-13 17:55:42 jonas Exp $ +# $Id: amavisd.conf.addon,v 1.14 2003-07-15 14:20:56 jonas Exp $ # # AMaViS configuration file addon (Debian package "amavisd-new") # @@ -27,6 +27,10 @@ $final_bad_header_destiny = D_BOUNCE; # We set Postfix timeout to 1200 for the filter, so should be safe raising it here as well $child_timeout=15*60; +# Deliver quarantined emails through postfix +$virus_quarantine_to = 'virus-quarantine@'; +$spam_quarantine_to = 'spam-quarantine@'; + # We explicitly set local domains @local_domains_acl = undef; my $local_domain_file="/etc/local-COMMON/amavis/local_domains_$mydomain"; @@ -38,10 +42,13 @@ if ( -f $local_domain_file ) { $spam_admin = "spamalert\@$mydomain"; -#$virus_lovers{lc('postmaster@')} = 1; -#$spam_lovers{lc('postmaster@')} = 1; -map { $virus_lovers{lc($_)}=1; $spam_lovers{lc($_)}=1; } (qw( +map { $virus_lovers{lc($_)}=1; } (qw( + postmaster@ + virusalert@ +)); +map { $spam_lovers{lc($_)}=1; } (qw( postmaster@ + spamalert@ )); $virus_admin = { @@ -66,6 +73,21 @@ $virus_admin = { '.simba-ngoma.com' => 'virusalert@107b.dk', '.shakin.dk' => 'virusalert@107b.dk', '.plastographique.com' => 'virusalert@107b.dk', + '.altnet.dk' => 'virusalert@bitbase.dk', + '.bitbase.dk' => 'virusalert@bitbase.dk', + '.gangstafilm.dk' => 'virusalert@bitbase.dk', + '.icas.dk' => 'virusalert@bitbase.dk', + '.patientsikkerhed.dk' => 'virusalert@bitbase.dk', + '.respons.dk' => 'virusalert@bitbase.dk', + '.taekkemand.net' => 'virusalert@bitbase.dk', + '.ascii33.com' => 'virusalert@bitbase.dk', + '.dekadentfilm.dk' => 'virusalert@bitbase.dk', + '.hcfotografi.dk' => 'virusalert@bitbase.dk', + '.minard.dk' => 'virusalert@bitbase.dk', + '.resolution.dk' => 'virusalert@bitbase.dk', + '.sebastianw.dk' => 'virusalert@bitbase.dk', + '.haakansson.com' => 'virusalert@haakansson.com', + '.shared.dk' => 'virusalert@shared.dk', '.diamond2002.dk' => 'virusalert@homebase.dk', '.frontloberne.dk' => 'virusalert@homebase.dk', '.frontrunners.net' => 'virusalert@homebase.dk', @@ -108,21 +130,6 @@ $virus_admin = { '.macronald.dk' => 'virusalert@jones.dk', '.nord-utte.org' => 'virusalert@jones.dk', '.riccos.dk' => 'virusalert@jones.dk', - '.altnet.dk' => 'virusalert@bitbase.dk', - '.bitbase.dk' => 'virusalert@bitbase.dk', - '.gangstafilm.dk' => 'virusalert@bitbase.dk', - '.icas.dk' => 'virusalert@bitbase.dk', - '.patientsikkerhed.dk' => 'virusalert@bitbase.dk', - '.respons.dk' => 'virusalert@bitbase.dk', - '.taekkemand.net' => 'virusalert@bitbase.dk', - '.ascii33.com' => 'virusalert@bitbase.dk', - '.dekadentfilm.dk' => 'virusalert@bitbase.dk', - '.hcfotografi.dk' => 'virusalert@bitbase.dk', - '.minard.dk' => 'virusalert@bitbase.dk', - '.resolution.dk' => 'virusalert@bitbase.dk', - '.sebastianw.dk' => 'virusalert@bitbase.dk', - '.haakansson.com' => 'virusalert@haakansson.com', - '.shared.dk' => 'virusalert@shared.dk', '.' => "virusalert\@$mydomain", }; @@ -148,6 +155,21 @@ $spam_admin = { '.simba-ngoma.com' => 'spamalert@107b.dk', '.shakin.dk' => 'spamalert@107b.dk', '.plastographique.com' => 'spamalert@107b.dk', + '.altnet.dk' => 'spamalert@bitbase.dk', + '.bitbase.dk' => 'spamalert@bitbase.dk', + '.gangstafilm.dk' => 'spamalert@bitbase.dk', + '.icas.dk' => 'spamalert@bitbase.dk', + '.patientsikkerhed.dk' => 'spamalert@bitbase.dk', + '.respons.dk' => 'spamalert@bitbase.dk', + '.taekkemand.net' => 'spamalert@bitbase.dk', + '.ascii33.com' => 'spamalert@bitbase.dk', + '.dekadentfilm.dk' => 'spamalert@bitbase.dk', + '.hcfotografi.dk' => 'spamalert@bitbase.dk', + '.minard.dk' => 'spamalert@bitbase.dk', + '.resolution.dk' => 'spamalert@bitbase.dk', + '.sebastianw.dk' => 'spamalert@bitbase.dk', + '.haakansson.com' => 'spamalert@haakansson.com', + '.shared.dk' => 'spamalert@shared.dk', '.diamond2002.dk' => 'spamalert@homebase.dk', '.frontloberne.dk' => 'spamalert@homebase.dk', '.frontrunners.net' => 'spamalert@homebase.dk', @@ -190,20 +212,5 @@ $spam_admin = { '.macronald.dk' => 'spamalert@jones.dk', '.nord-utte.org' => 'spamalert@jones.dk', '.riccos.dk' => 'spamalert@jones.dk', - '.altnet.dk' => 'spamalert@bitbase.dk', - '.bitbase.dk' => 'spamalert@bitbase.dk', - '.gangstafilm.dk' => 'spamalert@bitbase.dk', - '.icas.dk' => 'spamalert@bitbase.dk', - '.patientsikkerhed.dk' => 'spamalert@bitbase.dk', - '.respons.dk' => 'spamalert@bitbase.dk', - '.taekkemand.net' => 'spamalert@bitbase.dk', - '.ascii33.com' => 'spamalert@bitbase.dk', - '.dekadentfilm.dk' => 'spamalert@bitbase.dk', - '.hcfotografi.dk' => 'spamalert@bitbase.dk', - '.minard.dk' => 'spamalert@bitbase.dk', - '.resolution.dk' => 'spamalert@bitbase.dk', - '.sebastianw.dk' => 'spamalert@bitbase.dk', - '.haakansson.com' => 'spamalert@haakansson.com', - '.shared.dk' => 'spamalert@shared.dk', '.' => "spamalert\@$mydomain", }; diff --git a/amavis/amavisd.conf.addon.in b/amavis/amavisd.conf.addon.in index 112fe3b..0ef3cba 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 # -# $Id: amavisd.conf.addon.in,v 1.2 2003-07-12 15:42:24 jonas Exp $ +# $Id: amavisd.conf.addon.in,v 1.3 2003-07-15 14:20:56 jonas Exp $ # # AMaViS configuration file addon (Debian package "amavisd-new") # @@ -25,6 +25,10 @@ $final_bad_header_destiny = D_BOUNCE; # We set Postfix timeout to 1200 for the filter, so should be safe raising it here as well $child_timeout=15*60; +# Deliver quarantined emails through postfix +$virus_quarantine_to = 'virus-quarantine@'; +$spam_quarantine_to = 'spam-quarantine@'; + # We explicitly set local domains @local_domains_acl = undef; my $local_domain_file="/etc/local-COMMON/amavis/local_domains_$mydomain"; @@ -36,8 +40,11 @@ if ( -f $local_domain_file ) { $spam_admin = "spamalert\@$mydomain"; -#$virus_lovers{lc('postmaster@')} = 1; -#$spam_lovers{lc('postmaster@')} = 1; -map { $virus_lovers{lc($_)}=1; $spam_lovers{lc($_)}=1; } (qw( +map { $virus_lovers{lc($_)}=1; } (qw( + postmaster@ + virusalert@ +)); +map { $spam_lovers{lc($_)}=1; } (qw( postmaster@ + spamalert@ )); -- cgit v1.2.3