From b2a13c3e619468c63b535fc52ffee66db9c706b4 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 11 Mar 2004 00:36:46 +0000
Subject: Correctly enable spamassassin. Add dgi-huset.dk setup. Leave all
 bouncing to amavisd-new.

---
 amavis/amavisd.conf.addon         | 10 +++++++++-
 amavis/amavisd.conf.addon.in      |  9 ++++++++-
 amavis/local_domains_dgi-huset.dk |  2 ++
 amavis/local_domains_shared.dk    |  1 -
 amavis/mkaddon.sh                 |  3 ++-
 5 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 amavis/local_domains_dgi-huset.dk
 delete mode 100644 amavis/local_domains_shared.dk

(limited to 'amavis')

diff --git a/amavis/amavisd.conf.addon b/amavis/amavisd.conf.addon
index 34e1539..12b7642 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.26 2003-08-18 02:00:23 jonas Exp $
+# $Id: amavisd.conf.addon,v 1.27 2004-03-11 00:36:46 jonas Exp $
 #
 # AMaViS configuration file addon (Debian package "amavisd-new")
 #
@@ -41,6 +41,13 @@ if ( -f $local_domain_file ) {
 	warn "Ignoring non-existing file $local_domain_file";
 }
 
+# Let amavisd-new handle all bouncing (postfix dual-MTA setup can't properly)
+$final_virus_destiny = D_BOUNCE;
+$final_banned_destiny = D_BOUNCE;
+$final_spam_destiny = D_BOUNCE;
+$final_bad_header_destiny = D_BOUNCE;
+
+$virus_admin = "virusalert\@$mydomain";
 $spam_admin = "spamalert\@$mydomain";
 
 $mailfrom_notify_admin     = "virusalert\@$mydomain";
@@ -55,3 +62,4 @@ map { $spam_lovers{lc($_)}=1; } (qw(
 	postmaster@
 	spamalert@
 ));
+$bypass_spam_checks_acl = qw( spamalert@ spam.police@ );
diff --git a/amavis/amavisd.conf.addon.in b/amavis/amavisd.conf.addon.in
index d9f504b..32db044 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.7 2003-08-17 22:05:03 jonas Exp $
+# $Id: amavisd.conf.addon.in,v 1.8 2004-03-11 00:36:46 jonas Exp $
 #
 # AMaViS configuration file addon (Debian package "amavisd-new")
 #
@@ -39,6 +39,13 @@ if ( -f $local_domain_file ) {
 	warn "Ignoring non-existing file $local_domain_file";
 }
 
+# Let amavisd-new handle all bouncing (postfix dual-MTA setup can't properly)
+$final_virus_destiny = D_BOUNCE;
+$final_banned_destiny = D_BOUNCE;
+$final_spam_destiny = D_BOUNCE;
+$final_bad_header_destiny = D_BOUNCE;
+
+$virus_admin = "virusalert\@$mydomain";
 $spam_admin = "spamalert\@$mydomain";
 
 $mailfrom_notify_admin     = "virusalert\@$mydomain";
diff --git a/amavis/local_domains_dgi-huset.dk b/amavis/local_domains_dgi-huset.dk
new file mode 100644
index 0000000..406f37d
--- /dev/null
+++ b/amavis/local_domains_dgi-huset.dk
@@ -0,0 +1,2 @@
+dgi-huset.dk
+dgihuset.dk
diff --git a/amavis/local_domains_shared.dk b/amavis/local_domains_shared.dk
deleted file mode 100644
index f6798b8..0000000
--- a/amavis/local_domains_shared.dk
+++ /dev/null
@@ -1 +0,0 @@
-shared.dk
diff --git a/amavis/mkaddon.sh b/amavis/mkaddon.sh
index 975ba8c..8bc632c 100755
--- a/amavis/mkaddon.sh
+++ b/amavis/mkaddon.sh
@@ -13,11 +13,12 @@ EOF
 
 grep -v '^#!/bin/perl' "$basedir/$destfile.in" >> "$basedir/$destfile.new"
 
+echo "\$bypass_spam_checks_acl = qw( spamalert@ spam.police@ );" >> "$basedir/$destfile.new"
+
 #####################################################
 # Something's wrong - avoid cross-domain sharing of notifications for now. :-(
 cp -af "$basedir/$destfile" "$basedir/$destfile.old"
 mv "$basedir/$destfile.new" "$basedir/$destfile"
-echo "\$bypass_spam_checks_acl = qw( spamalert@ spam.police@ );" >> "$basedir/$destfile.new"
 exit 0
 #####################################################
 
-- 
cgit v1.2.3