Support optional emailhost and urlhost arguments to mklist(); drop unusused LISTDOMAIN.

2 files changed, 6 insertions, 4 deletions

diff --git a/mailman/mklist.inc b/mailman/mklist.inc
index 0bd6862..3c38c60 100644
--- a/mailman/mklist.inc
+++ b/mailman/mklist.inc
@@ -7,7 +7,6 @@ sharedir="/etc/local-COMMON/mailman"
 skeldir="$sharedir/skel"
 
 MAILDOMAIN="${maildomain:-`head -n 1 /etc/mailname`}"
-LISTDOMAIN="${listdomain:-lists.$MAILDOMAIN}"
 OWNER="${owner:-listmaster@$MAILDOMAIN}"
 LANG="${lang:-en}"
 
@@ -21,11 +20,13 @@ mklist() {
 	desc="$1"; shift
 	lang="${1:-$LANG}"
 	owner="${2:-$OWNER}"
+	emailhost="$3"
+	urlhost="$4"
 
 	if ! echo "$existinglists" | grep -q "^$list\$"; then
-		newlist -l "$lang" -q "$list" "$owner" "`gpw | head -n 1`"
+		newlist -l "$lang" -q "$list" ${emailhost:+-e "$emailhost"} ${urlhost:+-u "$urlhost"} "$owner" "`gpw | head -n 1`"
 	fi
-	LISTNAME="$list" LISTDESC="$desc" LISTOWNER="$owner" "$sharedir/mklist.pl" "$skeldir/$type.$lang.py" > "$list.py"
+	LISTNAME="$list" LISTDESC="$desc" LISTOWNER="$owner" ${emailhost:+LISTHOST="$emailhost"} "$sharedir/mklist.pl" "$skeldir/$type.$lang.py" > "$list.py"
 	config_list -i "$cfgdir/$list.py" "$list"
 	config_list -o "$cfgdir/$list.py" "$list"
 }
diff --git a/mailman/mklist.pl b/mailman/mklist.pl
index 8d3936b..c15d799 100755
--- a/mailman/mklist.pl
+++ b/mailman/mklist.pl
@@ -25,7 +25,8 @@ while (<>) {
 	# Replace keywords - except in comments
 	s/^([^#]*)LISTNAME/$1$listname/g;
 	s/^([^#]*)LISTDESC/$1$listdesc/g;
-	s/^([^#]*)LISTHOST/$1$listhost/g;
+	s/^([^#]*)LISTHOST/$1$listhost/g if ($listhost);
+	s/^([^#]*)LISTHOST/#$1/g unless ($listhost);
 	s/^([^#]*)SENDERS/$1$senders/g;
 	s/^([^#]*)SENDERFILTER/$1$senderfilter/g;
 	s/^([^#]*)LISTOWNER/$1$listowner/g;