From f09e8af52b32365de60f6cad6215c024c7d6035f Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 11 Nov 2010 09:40:18 +0100
Subject: Fix typo in comment.

---
 mailman/mklist.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mailman')

diff --git a/mailman/mklist.pl b/mailman/mklist.pl
index 847234b..8d3936b 100755
--- a/mailman/mklist.pl
+++ b/mailman/mklist.pl
@@ -22,7 +22,7 @@ $senderfilter ||= $ENV{'SENDERFILTER'} or die "SENDERFILTER missing";
 $listowner ||= $ENV{'LISTOWNER'} or die "LISTOWNER missing";
 
 while (<>) {
-	# Replace keywords - execept in comments
+	# Replace keywords - except in comments
 	s/^([^#]*)LISTNAME/$1$listname/g;
 	s/^([^#]*)LISTDESC/$1$listdesc/g;
 	s/^([^#]*)LISTHOST/$1$listhost/g;
-- 
cgit v1.2.3


From 87d53b78b69cd9ff5deeabf3dbd172374b8c3461 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 11 Nov 2010 09:47:32 +0100
Subject: Support optional emailhost and urlhost arguments to mklist(); drop
 unusused LISTDOMAIN.

---
 mailman/mklist.inc | 7 ++++---
 mailman/mklist.pl  | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'mailman')

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;
-- 
cgit v1.2.3