diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-11-11 09:57:04 +0100 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-11-11 09:57:04 +0100 |
| commit | 001307c578431cedf5b4e495109145ca3c04da4b (patch) | |
| tree | d56e2b95c2d7ae5fab27c0845791c46719b58053 /mailman | |
| parent | 50be5f7c0f3d5b245da0c9ab640b6e86e8a612ea (diff) | |
| parent | 87d53b78b69cd9ff5deeabf3dbd172374b8c3461 (diff) | |
Merge branch 'master' of git://source.jones.dk/local-COMMON
Conflicts (manually resolve):
mailman/mklist.inc
Diffstat (limited to 'mailman')
| -rw-r--r-- | mailman/mklist.inc | 2 | ||||
| -rwxr-xr-x | mailman/mklist.pl | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mailman/mklist.inc b/mailman/mklist.inc index 6323a21..65281f4 100644 --- a/mailman/mklist.inc +++ b/mailman/mklist.inc @@ -28,7 +28,7 @@ mklist() { if ! echo "$existinglists" | grep -q "^$list\$"; then newlist -l "$lang"${urlhost:+ -u "$urlhost"}${emailhost:+ -e "$emailhost"} -q "$list" "$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 ff62787..8c7e72c 100755 --- a/mailman/mklist.pl +++ b/mailman/mklist.pl @@ -28,10 +28,11 @@ $listowners ||= $ENV{'LISTOWNERS'}; $listowners ||= "'" . $listowner . "'" or die "LISTOWNER(S) 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; + s/^([^#]*)LISTHOST/$1$listhost/g if ($listhost); + s/^([^#]*)LISTHOST/#$1/g unless ($listhost); s/^([^#]*)SENDERS/$1$senders/g; s/^([^#]*)SENDERFILTERS/$1$senderfilters/g; s/^([^#]*)LISTOWNERS/$1$listowners/g; |