Run mkaddon.sh. A couple more small tweaks.

2 files changed, 86 insertions, 83 deletions

diff --git a/amavis/amavisd.conf.addon b/amavis/amavisd.conf.addon
index 70cf4e8..a3ed126 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.11 2003-07-12 15:42:24 jonas Exp $
+# $Id: amavisd.conf.addon,v 1.12 2003-07-12 15:53:36 jonas Exp $
 #
 # AMaViS configuration file addon (Debian package "amavisd-new")
 #
@@ -24,6 +24,9 @@ $sa_auto_whitelist = 1;
 $final_spam_destiny       = D_BOUNCE;
 $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;
+
 # We explicitly set local domains
 @local_domains_acl = undef;
 my $local_domain_file="/etc/local-COMMON/amavis/local_domains_$mydomain";
@@ -42,123 +45,123 @@ map { $virus_lovers{lc($_)}=1; $spam_lovers{lc($_)}=1; } (qw(
 ));
 
 $virus_admin = {
-	'.altnet.dk'	=> 'virusalert@bitbase.dk',
-	'.ascii33.com'	=> 'virusalert@bitbase.dk',
-	'.bitbase.dk'	=> 'virusalert@bitbase.dk',
-	'.dekadentfilm.dk'	=> 'virusalert@bitbase.dk',
-	'.gangstafilm.dk'	=> 'virusalert@bitbase.dk',
-	'.hcfotografi.dk'	=> 'virusalert@bitbase.dk',
-	'.icas.dk'	=> 'virusalert@bitbase.dk',
-	'.minard.dk'	=> 'virusalert@bitbase.dk',
-	'.patientsikkerhed.dk'	=> 'virusalert@bitbase.dk',
-	'.resolution.dk'	=> 'virusalert@bitbase.dk',
-	'.respons.dk'	=> 'virusalert@bitbase.dk',
-	'.sebastianw.dk'	=> 'virusalert@bitbase.dk',
-	'.taekkemand.net'	=> 'virusalert@bitbase.dk',
+	'.haakansson.com'	=> 'virusalert@haakansson.com',
 	'.diamond2002.dk'	=> 'virusalert@homebase.dk',
-	'.flightnavigator.dk'	=> 'virusalert@homebase.dk',
 	'.frontloberne.dk'	=> 'virusalert@homebase.dk',
-	'.frontloeberne.dk'	=> 'virusalert@homebase.dk',
 	'.frontrunners.net'	=> 'virusalert@homebase.dk',
-	'.homebase.dk'	=> 'virusalert@homebase.dk',
 	'.kaos-communication.com'	=> 'virusalert@homebase.dk',
-	'.kaos-communication.dk'	=> 'virusalert@homebase.dk',
 	'.kaoscommunication.com'	=> 'virusalert@homebase.dk',
-	'.kaoscommunication.dk'	=> 'virusalert@homebase.dk',
 	'.kaoshardcore.com'	=> 'virusalert@homebase.dk',
-	'.kaoshardcore.dk'	=> 'virusalert@homebase.dk',
 	'.kaosheartcore.com'	=> 'virusalert@homebase.dk',
-	'.kaosheartcore.dk'	=> 'virusalert@homebase.dk',
 	'.kaoslab.dk'	=> 'virusalert@homebase.dk',
-	'.kaosman.com'	=> 'virusalert@homebase.dk',
 	'.kaosman.dk'	=> 'virusalert@homebase.dk',
-	'.kaosmanagement.com'	=> 'virusalert@homebase.dk',
 	'.kaosmanagement.dk'	=> 'virusalert@homebase.dk',
-	'.kaospilot.dk'	=> 'virusalert@homebase.dk',
 	'.localplayers.dk'	=> 'virusalert@homebase.dk',
-	'.nyxforum.dk'	=> 'virusalert@homebase.dk',
 	'.stellabella.com'	=> 'virusalert@homebase.dk',
-	'.haakansson.com'	=> 'virusalert@haakansson.com',
+	'.flightnavigator.dk'	=> 'virusalert@homebase.dk',
+	'.frontloeberne.dk'	=> 'virusalert@homebase.dk',
+	'.homebase.dk'	=> 'virusalert@homebase.dk',
+	'.kaos-communication.dk'	=> 'virusalert@homebase.dk',
+	'.kaoscommunication.dk'	=> 'virusalert@homebase.dk',
+	'.kaoshardcore.dk'	=> 'virusalert@homebase.dk',
+	'.kaosheartcore.dk'	=> 'virusalert@homebase.dk',
+	'.kaosman.com'	=> 'virusalert@homebase.dk',
+	'.kaosmanagement.com'	=> 'virusalert@homebase.dk',
+	'.kaospilot.dk'	=> 'virusalert@homebase.dk',
+	'.nyxforum.dk'	=> 'virusalert@homebase.dk',
+	'.shared.dk'	=> 'virusalert@shared.dk',
 	'.bawnager.dk'	=> 'virusalert@jones.dk',
-	'.cph-bmx.dk'	=> 'virusalert@jones.dk',
 	'.craignative.com'	=> 'virusalert@jones.dk',
-	'.dgi-huset.dk'	=> 'virusalert@jones.dk',
 	'.faelleskab.dk'	=> 'virusalert@jones.dk',
-	'.faelleskabet.dk'	=> 'virusalert@jones.dk',
 	'.faellesskab.dk'	=> 'virusalert@jones.dk',
-	'.helbak.com'	=> 'virusalert@jones.dk',
 	'.helbak.dk'	=> 'virusalert@jones.dk',
-	'.jones.dk'	=> 'virusalert@jones.dk',
 	'.kassandra-production.dk'	=> 'virusalert@jones.dk',
-	'.knudemand.dk'	=> 'virusalert@jones.dk',
 	'.knudemanden.dk'	=> 'virusalert@jones.dk',
-	'.macronald.dk'	=> 'virusalert@jones.dk',
 	'.nilsstaerk.dk'	=> 'virusalert@jones.dk',
-	'.nord-utte.org'	=> 'virusalert@jones.dk',
 	'.public-e.dk'	=> 'virusalert@jones.dk',
-	'.riccos.dk'	=> 'virusalert@jones.dk',
 	'.vesterkaer.dk'	=> 'virusalert@jones.dk',
-	'.shared.dk'	=> 'virusalert@shared.dk',
+	'.cph-bmx.dk'	=> 'virusalert@jones.dk',
+	'.dgi-huset.dk'	=> 'virusalert@jones.dk',
+	'.faelleskabet.dk'	=> 'virusalert@jones.dk',
+	'.helbak.com'	=> 'virusalert@jones.dk',
+	'.jones.dk'	=> 'virusalert@jones.dk',
+	'.knudemand.dk'	=> 'virusalert@jones.dk',
+	'.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',
 	'.'	=> "virusalert\@$mydomain",
 };
 
 $spam_admin = {
-	'.altnet.dk'	=> 'spamalert@bitbase.dk',
-	'.ascii33.com'	=> 'spamalert@bitbase.dk',
-	'.bitbase.dk'	=> 'spamalert@bitbase.dk',
-	'.dekadentfilm.dk'	=> 'spamalert@bitbase.dk',
-	'.gangstafilm.dk'	=> 'spamalert@bitbase.dk',
-	'.hcfotografi.dk'	=> 'spamalert@bitbase.dk',
-	'.icas.dk'	=> 'spamalert@bitbase.dk',
-	'.minard.dk'	=> 'spamalert@bitbase.dk',
-	'.patientsikkerhed.dk'	=> 'spamalert@bitbase.dk',
-	'.resolution.dk'	=> 'spamalert@bitbase.dk',
-	'.respons.dk'	=> 'spamalert@bitbase.dk',
-	'.sebastianw.dk'	=> 'spamalert@bitbase.dk',
-	'.taekkemand.net'	=> 'spamalert@bitbase.dk',
+	'.haakansson.com'	=> 'spamalert@haakansson.com',
 	'.diamond2002.dk'	=> 'spamalert@homebase.dk',
-	'.flightnavigator.dk'	=> 'spamalert@homebase.dk',
 	'.frontloberne.dk'	=> 'spamalert@homebase.dk',
-	'.frontloeberne.dk'	=> 'spamalert@homebase.dk',
 	'.frontrunners.net'	=> 'spamalert@homebase.dk',
-	'.homebase.dk'	=> 'spamalert@homebase.dk',
 	'.kaos-communication.com'	=> 'spamalert@homebase.dk',
-	'.kaos-communication.dk'	=> 'spamalert@homebase.dk',
 	'.kaoscommunication.com'	=> 'spamalert@homebase.dk',
-	'.kaoscommunication.dk'	=> 'spamalert@homebase.dk',
 	'.kaoshardcore.com'	=> 'spamalert@homebase.dk',
-	'.kaoshardcore.dk'	=> 'spamalert@homebase.dk',
 	'.kaosheartcore.com'	=> 'spamalert@homebase.dk',
-	'.kaosheartcore.dk'	=> 'spamalert@homebase.dk',
 	'.kaoslab.dk'	=> 'spamalert@homebase.dk',
-	'.kaosman.com'	=> 'spamalert@homebase.dk',
 	'.kaosman.dk'	=> 'spamalert@homebase.dk',
-	'.kaosmanagement.com'	=> 'spamalert@homebase.dk',
 	'.kaosmanagement.dk'	=> 'spamalert@homebase.dk',
-	'.kaospilot.dk'	=> 'spamalert@homebase.dk',
 	'.localplayers.dk'	=> 'spamalert@homebase.dk',
-	'.nyxforum.dk'	=> 'spamalert@homebase.dk',
 	'.stellabella.com'	=> 'spamalert@homebase.dk',
-	'.haakansson.com'	=> 'spamalert@haakansson.com',
+	'.flightnavigator.dk'	=> 'spamalert@homebase.dk',
+	'.frontloeberne.dk'	=> 'spamalert@homebase.dk',
+	'.homebase.dk'	=> 'spamalert@homebase.dk',
+	'.kaos-communication.dk'	=> 'spamalert@homebase.dk',
+	'.kaoscommunication.dk'	=> 'spamalert@homebase.dk',
+	'.kaoshardcore.dk'	=> 'spamalert@homebase.dk',
+	'.kaosheartcore.dk'	=> 'spamalert@homebase.dk',
+	'.kaosman.com'	=> 'spamalert@homebase.dk',
+	'.kaosmanagement.com'	=> 'spamalert@homebase.dk',
+	'.kaospilot.dk'	=> 'spamalert@homebase.dk',
+	'.nyxforum.dk'	=> 'spamalert@homebase.dk',
+	'.shared.dk'	=> 'spamalert@shared.dk',
 	'.bawnager.dk'	=> 'spamalert@jones.dk',
-	'.cph-bmx.dk'	=> 'spamalert@jones.dk',
 	'.craignative.com'	=> 'spamalert@jones.dk',
-	'.dgi-huset.dk'	=> 'spamalert@jones.dk',
 	'.faelleskab.dk'	=> 'spamalert@jones.dk',
-	'.faelleskabet.dk'	=> 'spamalert@jones.dk',
 	'.faellesskab.dk'	=> 'spamalert@jones.dk',
-	'.helbak.com'	=> 'spamalert@jones.dk',
 	'.helbak.dk'	=> 'spamalert@jones.dk',
-	'.jones.dk'	=> 'spamalert@jones.dk',
 	'.kassandra-production.dk'	=> 'spamalert@jones.dk',
-	'.knudemand.dk'	=> 'spamalert@jones.dk',
 	'.knudemanden.dk'	=> 'spamalert@jones.dk',
-	'.macronald.dk'	=> 'spamalert@jones.dk',
 	'.nilsstaerk.dk'	=> 'spamalert@jones.dk',
-	'.nord-utte.org'	=> 'spamalert@jones.dk',
 	'.public-e.dk'	=> 'spamalert@jones.dk',
-	'.riccos.dk'	=> 'spamalert@jones.dk',
 	'.vesterkaer.dk'	=> 'spamalert@jones.dk',
-	'.shared.dk'	=> 'spamalert@shared.dk',
+	'.cph-bmx.dk'	=> 'spamalert@jones.dk',
+	'.dgi-huset.dk'	=> 'spamalert@jones.dk',
+	'.faelleskabet.dk'	=> 'spamalert@jones.dk',
+	'.helbak.com'	=> 'spamalert@jones.dk',
+	'.jones.dk'	=> 'spamalert@jones.dk',
+	'.knudemand.dk'	=> 'spamalert@jones.dk',
+	'.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',
 	'.'	=> "spamalert\@$mydomain",
 };
diff --git a/amavis/mkaddon.sh b/amavis/mkaddon.sh
index a9cda01..8bd46c0 100755
--- a/amavis/mkaddon.sh
+++ b/amavis/mkaddon.sh
@@ -5,37 +5,37 @@ set -e
 basedir="/etc/local-COMMON/amavis"
 destfile="amavisd.conf.addon"
 
->"$basedir"/"$destfile".new cat <<EOF
+>"$basedir/$destfile.new" cat <<EOF
 #!/bin/perl
 ### WARNING: This file is generated automatically.
 ### Please edit $destfile.in and run mkaddon.sh
 EOF
 
-cat "$basedir"/"$destfile".in >> "$basedir"/"$destfile".new
+grep -v '^#!/bin/perl' "$basedir/$destfile.in" >> "$basedir/$destfile.new"
 
-domainfiles="`find "$basedir" -name 'local_domains_*' -type f`"
+domainfiles="`find "$basedir" -name 'local_domains_*' -type f | tsort`"
 maildomains=""
 for domainfile in $domainfiles; do
-	maildomain="`basename $domainfile | sed 's/local_domains_//'`"
+	maildomain="`basename $domainfile | sed 's/local_domains_//' | tsort`"
 	maildomain_="`echo $maildomain | sed 's/\./_/g'`"
 	maildomains="$maildomains $maildomain"
-	domains="`cat "$domainfile" | grep -v '^#' | sed 's/#.*//'`"
+	domains="`cat "$domainfile" | grep -v '^#' | sed 's/#.*//' | tsort`"
 	eval "domains_$maildomain_=\"$domains\""
 done
 
 for thing in virus spam; do
-	echo >> "$basedir"/"$destfile".new
-	echo "\$${thing}_admin = {" >> "$basedir"/"$destfile".new
+	echo >> "$basedir/$destfile.new"
+	echo "\$${thing}_admin = {" >> "$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'	=> '${thing}alert@$maildomain'," >> "$basedir"/"$destfile".new
+			echo "	'.$domain'	=> '${thing}alert@$maildomain'," >> "$basedir/$destfile.new"
 		done
 	done
-	echo "	'.'	=> \"${thing}alert\\@\$mydomain\"," >> "$basedir"/"$destfile".new
-	echo "};" >> "$basedir"/"$destfile".new
+	echo "	'.'	=> \"${thing}alert\\@\$mydomain\"," >> "$basedir/$destfile.new"
+	echo "};" >> "$basedir/$destfile.new"
 done
 
-cp -af "$basedir"/"$destfile" "$basedir"/"$destfile".old
-mv "$basedir"/"$destfile".new "$basedir"/"$destfile"
+cp -af "$basedir/$destfile" "$basedir/$destfile.old"
+mv "$basedir/$destfile.new" "$basedir/$destfile"