1 files changed, 1 insertions, 19 deletions
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"