Drop disabling SpamAssassin and instead bypass both virus and spam checks and for all AMaViS pool sender addresses (which should also suppress notifications as of amavisd-new-20030616-p4.

2 files changed, 3 insertions, 297 deletions

diff --git a/amavis/amavisd.conf.addon b/amavis/amavisd.conf.addon
index c08ffe1..9fa476c 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.23 2003-08-17 23:16:46 jonas Exp $
+# $Id: amavisd.conf.addon,v 1.24 2003-08-17 23:43:05 jonas Exp $
 #
 # AMaViS configuration file addon (Debian package "amavisd-new")
 #
@@ -56,7 +56,7 @@ map { $spam_lovers{lc($_)}=1; } (qw(
 	spamalert@
 ));
 
-map { $whitelist_sender{lc($_)}=1 } (qw(
+map { $bypass_virus_checks{lc($_)}=1; $bypass_spam_checks{lc($_)}=1; } (qw(
 	virusalert@haakansson.com
 	spamalert@haakansson.com
 	spam.police@haakansson.com
@@ -266,279 +266,3 @@ $spam_admin = {
 	'.shared.dk'	=> 'spamalert@shared.dk',
 	'.'	=> "spamalert\@$mydomain",
 };
-
-$sa_tag_level_deflt = {
-	'.haakansson.com'	=> 99,
-	'.diamond2002.dk'	=> 99,
-	'.flightnavigator.dk'	=> 99,
-	'.frontloberne.dk'	=> 99,
-	'.frontloeberne.dk'	=> 99,
-	'.frontrunners.net'	=> 99,
-	'.homebase.dk'	=> 99,
-	'.kaos-communication.com'	=> 99,
-	'.kaos-communication.dk'	=> 99,
-	'.kaoscommunication.com'	=> 99,
-	'.kaoscommunication.dk'	=> 99,
-	'.kaoshardcore.com'	=> 99,
-	'.kaoshardcore.dk'	=> 99,
-	'.kaosheartcore.com'	=> 99,
-	'.kaosheartcore.dk'	=> 99,
-	'.kaoslab.dk'	=> 99,
-	'.kaosman.com'	=> 99,
-	'.kaosman.dk'	=> 99,
-	'.kaosmanagement.com'	=> 99,
-	'.kaosmanagement.dk'	=> 99,
-	'.kaospilot.dk'	=> 99,
-	'.localplayers.dk'	=> 99,
-	'.nyxforum.dk'	=> 99,
-	'.stellabella.com'	=> 99,
-	'.bawnager.dk'	=> 99,
-	'.cph-bmx.dk'	=> 99,
-	'.craignative.com'	=> 99,
-	'.dgi-huset.dk'	=> 99,
-	'.faelleskab.dk'	=> 99,
-	'.faelleskabet.dk'	=> 99,
-	'.faellesskab.dk'	=> 99,
-	'.helbak.com'	=> 99,
-	'.helbak.dk'	=> 99,
-	'.jones.dk'	=> 99,
-	'.kassandra-production.dk'	=> 99,
-	'.knudemand.dk'	=> 99,
-	'.knudemanden.dk'	=> 99,
-	'.macronald.dk'	=> 99,
-	'.nilsstaerk.dk'	=> 99,
-	'.nord-utte.org'	=> 99,
-	'.public-e.dk'	=> 99,
-	'.riccos.dk'	=> 99,
-	'.vesterkaer.dk'	=> 99,
-	'.107b.dk'	=> 99,
-	'.beep.dk'	=> 99,
-	'.fidse.org'	=> 99,
-	'.fisse.org'	=> 99,
-	'.komponent.dk'	=> 99,
-	'.kontur.dk'	=> 99,
-	'.krammebamzen.stoej.org'	=> 99,
-	'.lenacarin.dk'	=> 99,
-	'.lists.107b.dk'	=> 99,
-	'.minusminusbb.dk'	=> 99,
-	'.mosedybet.dk'	=> 99,
-	'.negon.dk'	=> 99,
-	'.plastographique.com'	=> 99,
-	'.read.107b.dk'	=> 99,
-	'.rohmann.dk'	=> 99,
-	'.rosforth.com'	=> 99,
-	'.rosforth.dk'	=> 99,
-	'.shakin.dk'	=> 99,
-	'.simba-ngoma.com'	=> 99,
-	'.stoej.org'	=> 99,
-	'.terusutaa.com'	=> 99,
-	'.altnet.dk'	=> 99,
-	'.ascii33.com'	=> 99,
-	'.bitbase.dk'	=> 99,
-	'.dekadentfilm.dk'	=> 99,
-	'.gangstafilm.dk'	=> 99,
-	'.hcfotografi.dk'	=> 99,
-	'.icas.dk'	=> 99,
-	'.minard.dk'	=> 99,
-	'.patientsikkerhed.dk'	=> 99,
-	'.resolution.dk'	=> 99,
-	'.respons.dk'	=> 99,
-	'.sebastianw.dk'	=> 99,
-	'.taekkemand.net'	=> 99,
-	'..conduct.dk'	=> 99,
-	'.adakrem.dk'	=> 99,
-	'.biks.dk'	=> 99,
-	'.klubien.com'	=> 99,
-	'.klubien.dk'	=> 99,
-	'.rgg.dk'	=> 99,
-	'.v50.dk'	=> 99,
-	'.vesterbrogade50.dk'	=> 99,
-	'.idaskolen.dk'	=> 99,
-	'.idraetsdaghojskolen.dk'	=> 99,
-	'.shared.dk'	=> 99,
-	'.'	=> 4.0,
-};
-
-$sa_tag2_level_deflt = {
-	'.haakansson.com'	=> 99,
-	'.diamond2002.dk'	=> 99,
-	'.flightnavigator.dk'	=> 99,
-	'.frontloberne.dk'	=> 99,
-	'.frontloeberne.dk'	=> 99,
-	'.frontrunners.net'	=> 99,
-	'.homebase.dk'	=> 99,
-	'.kaos-communication.com'	=> 99,
-	'.kaos-communication.dk'	=> 99,
-	'.kaoscommunication.com'	=> 99,
-	'.kaoscommunication.dk'	=> 99,
-	'.kaoshardcore.com'	=> 99,
-	'.kaoshardcore.dk'	=> 99,
-	'.kaosheartcore.com'	=> 99,
-	'.kaosheartcore.dk'	=> 99,
-	'.kaoslab.dk'	=> 99,
-	'.kaosman.com'	=> 99,
-	'.kaosman.dk'	=> 99,
-	'.kaosmanagement.com'	=> 99,
-	'.kaosmanagement.dk'	=> 99,
-	'.kaospilot.dk'	=> 99,
-	'.localplayers.dk'	=> 99,
-	'.nyxforum.dk'	=> 99,
-	'.stellabella.com'	=> 99,
-	'.bawnager.dk'	=> 99,
-	'.cph-bmx.dk'	=> 99,
-	'.craignative.com'	=> 99,
-	'.dgi-huset.dk'	=> 99,
-	'.faelleskab.dk'	=> 99,
-	'.faelleskabet.dk'	=> 99,
-	'.faellesskab.dk'	=> 99,
-	'.helbak.com'	=> 99,
-	'.helbak.dk'	=> 99,
-	'.jones.dk'	=> 99,
-	'.kassandra-production.dk'	=> 99,
-	'.knudemand.dk'	=> 99,
-	'.knudemanden.dk'	=> 99,
-	'.macronald.dk'	=> 99,
-	'.nilsstaerk.dk'	=> 99,
-	'.nord-utte.org'	=> 99,
-	'.public-e.dk'	=> 99,
-	'.riccos.dk'	=> 99,
-	'.vesterkaer.dk'	=> 99,
-	'.107b.dk'	=> 99,
-	'.beep.dk'	=> 99,
-	'.fidse.org'	=> 99,
-	'.fisse.org'	=> 99,
-	'.komponent.dk'	=> 99,
-	'.kontur.dk'	=> 99,
-	'.krammebamzen.stoej.org'	=> 99,
-	'.lenacarin.dk'	=> 99,
-	'.lists.107b.dk'	=> 99,
-	'.minusminusbb.dk'	=> 99,
-	'.mosedybet.dk'	=> 99,
-	'.negon.dk'	=> 99,
-	'.plastographique.com'	=> 99,
-	'.read.107b.dk'	=> 99,
-	'.rohmann.dk'	=> 99,
-	'.rosforth.com'	=> 99,
-	'.rosforth.dk'	=> 99,
-	'.shakin.dk'	=> 99,
-	'.simba-ngoma.com'	=> 99,
-	'.stoej.org'	=> 99,
-	'.terusutaa.com'	=> 99,
-	'.altnet.dk'	=> 99,
-	'.ascii33.com'	=> 99,
-	'.bitbase.dk'	=> 99,
-	'.dekadentfilm.dk'	=> 99,
-	'.gangstafilm.dk'	=> 99,
-	'.hcfotografi.dk'	=> 99,
-	'.icas.dk'	=> 99,
-	'.minard.dk'	=> 99,
-	'.patientsikkerhed.dk'	=> 99,
-	'.resolution.dk'	=> 99,
-	'.respons.dk'	=> 99,
-	'.sebastianw.dk'	=> 99,
-	'.taekkemand.net'	=> 99,
-	'..conduct.dk'	=> 99,
-	'.adakrem.dk'	=> 99,
-	'.biks.dk'	=> 99,
-	'.klubien.com'	=> 99,
-	'.klubien.dk'	=> 99,
-	'.rgg.dk'	=> 99,
-	'.v50.dk'	=> 99,
-	'.vesterbrogade50.dk'	=> 99,
-	'.idaskolen.dk'	=> 99,
-	'.idraetsdaghojskolen.dk'	=> 99,
-	'.shared.dk'	=> 99,
-	'.'	=> 6.3,
-};
-
-$sa_kill_level_deflt = {
-	'.haakansson.com'	=> 99,
-	'.diamond2002.dk'	=> 99,
-	'.flightnavigator.dk'	=> 99,
-	'.frontloberne.dk'	=> 99,
-	'.frontloeberne.dk'	=> 99,
-	'.frontrunners.net'	=> 99,
-	'.homebase.dk'	=> 99,
-	'.kaos-communication.com'	=> 99,
-	'.kaos-communication.dk'	=> 99,
-	'.kaoscommunication.com'	=> 99,
-	'.kaoscommunication.dk'	=> 99,
-	'.kaoshardcore.com'	=> 99,
-	'.kaoshardcore.dk'	=> 99,
-	'.kaosheartcore.com'	=> 99,
-	'.kaosheartcore.dk'	=> 99,
-	'.kaoslab.dk'	=> 99,
-	'.kaosman.com'	=> 99,
-	'.kaosman.dk'	=> 99,
-	'.kaosmanagement.com'	=> 99,
-	'.kaosmanagement.dk'	=> 99,
-	'.kaospilot.dk'	=> 99,
-	'.localplayers.dk'	=> 99,
-	'.nyxforum.dk'	=> 99,
-	'.stellabella.com'	=> 99,
-	'.bawnager.dk'	=> 99,
-	'.cph-bmx.dk'	=> 99,
-	'.craignative.com'	=> 99,
-	'.dgi-huset.dk'	=> 99,
-	'.faelleskab.dk'	=> 99,
-	'.faelleskabet.dk'	=> 99,
-	'.faellesskab.dk'	=> 99,
-	'.helbak.com'	=> 99,
-	'.helbak.dk'	=> 99,
-	'.jones.dk'	=> 99,
-	'.kassandra-production.dk'	=> 99,
-	'.knudemand.dk'	=> 99,
-	'.knudemanden.dk'	=> 99,
-	'.macronald.dk'	=> 99,
-	'.nilsstaerk.dk'	=> 99,
-	'.nord-utte.org'	=> 99,
-	'.public-e.dk'	=> 99,
-	'.riccos.dk'	=> 99,
-	'.vesterkaer.dk'	=> 99,
-	'.107b.dk'	=> 99,
-	'.beep.dk'	=> 99,
-	'.fidse.org'	=> 99,
-	'.fisse.org'	=> 99,
-	'.komponent.dk'	=> 99,
-	'.kontur.dk'	=> 99,
-	'.krammebamzen.stoej.org'	=> 99,
-	'.lenacarin.dk'	=> 99,
-	'.lists.107b.dk'	=> 99,
-	'.minusminusbb.dk'	=> 99,
-	'.mosedybet.dk'	=> 99,
-	'.negon.dk'	=> 99,
-	'.plastographique.com'	=> 99,
-	'.read.107b.dk'	=> 99,
-	'.rohmann.dk'	=> 99,
-	'.rosforth.com'	=> 99,
-	'.rosforth.dk'	=> 99,
-	'.shakin.dk'	=> 99,
-	'.simba-ngoma.com'	=> 99,
-	'.stoej.org'	=> 99,
-	'.terusutaa.com'	=> 99,
-	'.altnet.dk'	=> 99,
-	'.ascii33.com'	=> 99,
-	'.bitbase.dk'	=> 99,
-	'.dekadentfilm.dk'	=> 99,
-	'.gangstafilm.dk'	=> 99,
-	'.hcfotografi.dk'	=> 99,
-	'.icas.dk'	=> 99,
-	'.minard.dk'	=> 99,
-	'.patientsikkerhed.dk'	=> 99,
-	'.resolution.dk'	=> 99,
-	'.respons.dk'	=> 99,
-	'.sebastianw.dk'	=> 99,
-	'.taekkemand.net'	=> 99,
-	'..conduct.dk'	=> 99,
-	'.adakrem.dk'	=> 99,
-	'.biks.dk'	=> 99,
-	'.klubien.com'	=> 99,
-	'.klubien.dk'	=> 99,
-	'.rgg.dk'	=> 99,
-	'.v50.dk'	=> 99,
-	'.vesterbrogade50.dk'	=> 99,
-	'.idaskolen.dk'	=> 99,
-	'.idraetsdaghojskolen.dk'	=> 99,
-	'.shared.dk'	=> 99,
-	'.'	=> ,
-};
diff --git a/amavis/mkaddon.sh b/amavis/mkaddon.sh
index 311ea9f..65bdc47 100755
--- a/amavis/mkaddon.sh
+++ b/amavis/mkaddon.sh
@@ -24,7 +24,7 @@ for domainfile in $domainfiles; do
 done
 
 echo >> "$basedir/$destfile.new"
-echo "map { \$whitelist_sender{lc(\$_)}=1 } (qw(" >> "$basedir/$destfile.new"
+echo "map { \$bypass_virus_checks{lc(\$_)}=1; \$bypass_spam_checks{lc(\$_)}=1; } (qw(" >> "$basedir/$destfile.new"
 for maildomain in $maildomains; do
 	echo "	virusalert@$maildomain" >> "$basedir/$destfile.new"
 	echo "	spamalert@$maildomain" >> "$basedir/$destfile.new"
@@ -46,23 +46,5 @@ for thing in virus spam; do
 	echo "};" >> "$basedir/$destfile.new"
 done
 
-tag_defaultvalue="4.0"
-tag2_defaultvalue="6.3"
-kill_defaultvalue="$tag2_default"
-for thing in tag tag2 kill; do
-	echo >> "$basedir/$destfile.new"
-	echo "\$sa_${thing}_level_deflt = {" >> "$basedir/$destfile.new"
-	for maildomain in $maildomains; do
-		maildomain_="`echo $maildomain | sed 's/\./_/g'`"
-		eval "domains=\"\$domains_$maildomain_\""
-		for domain in $domains; do
-			echo "	'.$domain'	=> 99," >> "$basedir/$destfile.new"
-		done
-	done
-	eval "defaultvalue=\"\$${thing}_defaultvalue\""
-	echo "	'.'	=> $defaultvalue," >> "$basedir/$destfile.new"
-	echo "};" >> "$basedir/$destfile.new"
-done
-
 cp -af "$basedir/$destfile" "$basedir/$destfile.old"
 mv "$basedir/$destfile.new" "$basedir/$destfile"