Simplify setup - Debian defaults are finally sane now.

2 files changed, 1 insertions, 100 deletions

diff --git a/amavis/amavisd.conf.addon b/amavis/amavisd.conf.addon
index 39e67db..fff0939 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.41 2006-07-31 01:13:58 jonas Exp $
+# $Id: amavisd.conf.addon,v 1.42 2006-07-31 02:25:13 jonas Exp $
 #
 # AMaViS configuration file addon (Debian package "amavisd-new")
 #
@@ -16,20 +16,6 @@
 #   do $config_file_addon or die "Error in config file $config_file_addon: $@";
 #
 
-# We use SpamAssassin >= 2.44 and have working Internet connection
-@bypass_spam_checks_acl  = undef;
-$bypass_spam_checks_acl = qw( spamalert@ spam.police@ );
-$sa_local_tests_only = 0;
-$sa_auto_whitelist = undef;
-$sa_timeout = 300;
-
-# 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
 my $local_domain_file="/etc/local-ORG/amavis/local_domains";
 if ( -f $local_domain_file ) {
@@ -40,29 +26,8 @@ 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_DISCARD;
-$final_banned_destiny = D_BOUNCE;
-$final_spam_destiny = D_BOUNCE;
-# But ignore bad headers
-$final_bad_header_destiny = D_PASS;
-
-$virus_admin = "virusalert\@$mydomain";
-$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@
-));
 map { $spam_lovers{lc($_)}=1; } (qw(
-	postmaster@
-	spamalert@
 	booking@dgi-huset.dk
 ));
-$bypass_spam_checks_acl = qw( spamalert@ spam.police@ );
 
 1;
diff --git a/amavis/amavisd.conf.addon.in b/amavis/amavisd.conf.addon.in
deleted file mode 100644
index a5d9807..0000000
--- a/amavis/amavisd.conf.addon.in
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/perl
-#
-# /etc/local-COMMON/amavisd.conf.addon
-# Copyright 2002 Jonas Smedegaard <dr@jones.dk>
-#
-# $Id: amavisd.conf.addon.in,v 1.17 2006-07-31 01:13:58 jonas Exp $
-#
-# AMaViS configuration file addon (Debian package "amavisd-new")
-#
-# Put the following lines at the end of /etc/amavis/amavisd.conf:
-#
-#   my $config_file_addon="/etc/local-COMMON/amavis/amavisd.conf.addon";
-#   -f $config_file_addon or die "Cannot find config file $config_file_addon";
-#   do $config_file_addon or die "Error in config file $config_file_addon: $@";
-#
-
-# We use SpamAssassin >= 2.44 and have working Internet connection
-@bypass_spam_checks_acl  = undef;
-$bypass_spam_checks_acl = qw( spamalert@ spam.police@ );
-$sa_local_tests_only = 0;
-#$sa_auto_whitelist = 1;
-$sa_timeout = 300;
-
-# 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
-my $local_domain_file="/etc/local-ORG/amavis/local_domains";
-if ( -f $local_domain_file ) {
-	@local_domains_acl = undef;
-	read_hash(\%local_domains, $local_domain_file);
-	read_hash(\%bypass_spam_checks, $local_domain_file);
-} else {
-	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_DISCARD;
-$final_banned_destiny = D_BOUNCE;
-$final_spam_destiny = D_BOUNCE;
-# But ignore bad headers
-$final_bad_header_destiny = D_PASS;
-
-$virus_admin = "virusalert\@$mydomain";
-$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@
-));
-map { $spam_lovers{lc($_)}=1; } (qw(
-	postmaster@
-	spamalert@
-	booking@dgi-huset.dk
-));
-$bypass_spam_checks_acl = qw( spamalert@ spam.police@ );