From b2c17178a427716bed948707c95dc946368c1646 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 11 Nov 2010 10:02:00 +0100 Subject: Fix unconditionally set LISTHOST (or it is confused for a command name - apparently shell expansion happens after separating out ENV vars. --- mailman/mklist.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mailman/mklist.inc b/mailman/mklist.inc index 857fbf7..3219f66 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" ${emailhost:+LISTHOST="$emailhost"} "$sharedir/mklist.pl" "$skeldir/$type.$lang.py" > "$list.py" + LISTNAME="$list" LISTDESC="$desc" LISTOWNER="$owner" 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" } -- cgit v1.2.3 From c658a078c326fc77a982591c915b815cbdcc7aa5 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 11 Nov 2010 10:30:21 +0100 Subject: Adjust templates: Include members in SENDERS. --- mailman/skel/private.en.py | 4 ++-- mailman/skel/sig.da.py | 4 ++-- mailman/skel/sig.en.py | 4 ++-- mailman/skel/sig.no.py | 4 ++-- mailman/skel/team.da.py | 4 ++-- mailman/skel/team.da.py.broken | 4 ++-- mailman/skel/team.en.py | 4 ++-- mailman/skel/team.no.py | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/mailman/skel/private.en.py b/mailman/skel/private.en.py index 1d0e0c6..1e4f33f 100644 --- a/mailman/skel/private.en.py +++ b/mailman/skel/private.en.py @@ -14,7 +14,7 @@ moderator = [] description = 'LISTDESC (censored, public)' info = """Closed list for LISTDESC. Archive is accessible only by list members. @@ -30,7 +30,7 @@ send_reminders = 0 welcome_msg = """This is a closed list for LISTDESC. * Anyone can send to the list (non-text parts are stripped). - * Posts are censored for relevancy (except from members and SENDERS). + * Posts are censored for relevancy (except from SENDERS). * Subscription only by invitation (only members can see member list). Censorship avoids some noise, but also increase risk of rejection or diff --git a/mailman/skel/sig.da.py b/mailman/skel/sig.da.py index 2276d3c..a629c84 100644 --- a/mailman/skel/sig.da.py +++ b/mailman/skel/sig.da.py @@ -14,7 +14,7 @@ moderator = [] description = 'LISTDESC (censureret, offentlig)' info = """Åben liste til LISTDESC. Arkiv er offentligt tilgængeligt. @@ -30,7 +30,7 @@ send_reminders = 0 welcome_msg = """Dette er en åben liste til LISTDESC. * Alle kan sende til listen (ikke-tekst filtreres fra). - * Indlæg censureres for relevans (undtagen fra medlemmer og SENDERS). + * Indlæg censureres for relevans (undtagen fra SENDERS). * Alle kan tilmelde sig listen (kun medlemmer kan se medlemsliste). Censur modvirker visse typer støj, men øger også risiko for afvisning diff --git a/mailman/skel/sig.en.py b/mailman/skel/sig.en.py index f0eff57..e46e2a8 100644 --- a/mailman/skel/sig.en.py +++ b/mailman/skel/sig.en.py @@ -14,7 +14,7 @@ moderator = [] description = 'LISTDESC (censored, public)' info = """Open list for LISTDESC. Archive is public accessible. @@ -30,7 +30,7 @@ send_reminders = 0 welcome_msg = """This is an open list for LISTDESC. * Anyone can send to the list (non-text parts are stripped). - * Posts are censored for relevancy (except from members and SENDERS). + * Posts are censored for relevancy (except from SENDERS). * Anyone can subscribe to the list (only members can see member list). Censorship avoids some noise, but also increase risk of rejection or diff --git a/mailman/skel/sig.no.py b/mailman/skel/sig.no.py index 0bbd495..6003aca 100644 --- a/mailman/skel/sig.no.py +++ b/mailman/skel/sig.no.py @@ -14,7 +14,7 @@ moderator = [] description = 'LISTDESC (censureret, offentlig)' info = """Åben liste til LISTDESC. Arkiv er offentligt tilgængeligt. @@ -30,7 +30,7 @@ send_reminders = 0 welcome_msg = """Dette er en åben liste til LISTDESC. * Alle kan sende til listen (ikke-tekst filtreres fra). - * Indlæg censureres for relevans (undtagen fra medlemmer og SENDERS). + * Indlæg censureres for relevans (undtagen fra SENDERS). * Alle kan tilmelde sig listen (kun medlemmer kan se medlemsliste). Censur modvirker visse typer støj, men øger også risiko for afvisning diff --git a/mailman/skel/team.da.py b/mailman/skel/team.da.py index 488d202..184b4ca 100644 --- a/mailman/skel/team.da.py +++ b/mailman/skel/team.da.py @@ -14,7 +14,7 @@ moderator = [] description = 'LISTDESC (censureret, semi-offentlig)' info = """Åben liste til LISTDESC. Adgangsbegrænsning til arkiv modvirker registrering i søgemaskiner, men sikrer ikke diskretion da enhver kan tilmelde sig og derved få adgang. @@ -30,7 +30,7 @@ send_reminders = 0 welcome_msg = """Dette er en åben liste til LISTDESC. * Alle kan sende til listen (ikke-tekst filtreres fra). - * Indlæg censureres for relevans (undtagen fra medlemmer og SENDERS). + * Indlæg censureres for relevans (undtagen fra SENDERS). * Alle kan tilmelde sig listen (kun medlemmer kan se medlemsliste). Adgangsbegrænsning til arkiv modvirker registrering i søgemaskiner, men diff --git a/mailman/skel/team.da.py.broken b/mailman/skel/team.da.py.broken index 7a48c31..4feef3f 100644 --- a/mailman/skel/team.da.py.broken +++ b/mailman/skel/team.da.py.broken @@ -17,7 +17,7 @@ moderator = [] description = 'LISTDESC (delvist offentlig)' info = """Ã…ben liste til LISTDESC. Adgangsbegrænsning til arkiv modvirker registrering i søgemaskiner, men sikrer ikke diskretion da enhver kan tilmelde sig og derved fÃ¥ adgang. Censur modvirker visse typer støj, men øger ogsÃ¥ risiko for afvisning eller forsinkelse af legitime indlæg: Tilmeld dig listen og brug din tilmeldte adresse som afsender hvis du vil sikre at indlæg nÃ¥r frem.""" @@ -32,7 +32,7 @@ send_reminders = 0 welcome_msg = """Dette er en Ã¥ben liste til LISTDESC. * Alle kan sende til listen (ikke-tekst filtreres fra). - * Indlæg censureres for relevans (undtagen fra medlemmer og SENDERS). + * Indlæg censureres for relevans (undtagen fra SENDERS). * Alle kan tilmelde sig listen (kun medlemmer kan se medlemsliste). Adgangsbegrænsning til arkiv modvirker registrering i søgemaskiner, men diff --git a/mailman/skel/team.en.py b/mailman/skel/team.en.py index e66b789..b11545b 100644 --- a/mailman/skel/team.en.py +++ b/mailman/skel/team.en.py @@ -14,7 +14,7 @@ moderator = [] description = 'LISTDESC (censored, semi-public)' info = """Open list for LISTDESC. Access limitation to the archive avoids search engine registrations, but does not ensure discretion as anyone can gain access by subscribing. @@ -30,7 +30,7 @@ send_reminders = 0 welcome_msg = """This is an open list for LISTDESC. * Anyone can send to the list (non-text parts are stripped). - * Posts are censored for relevancy (except from members and SENDERS). + * Posts are censored for relevancy (except from SENDERS). * Anyone can subscribe to the list (only members can see member list). Access limitation to the archive avoids search engine registrations, diff --git a/mailman/skel/team.no.py b/mailman/skel/team.no.py index adddf59..98d79f6 100644 --- a/mailman/skel/team.no.py +++ b/mailman/skel/team.no.py @@ -14,7 +14,7 @@ moderator = [] description = 'LISTDESC (censureret, semi-offentlig)' info = """Åben liste til LISTDESC. Adgangsbegrænsning til arkiv modvirker registrering i søgemaskiner, men sikrer ikke diskretion da enhver kan tilmelde sig og derved få adgang. @@ -30,7 +30,7 @@ send_reminders = 0 welcome_msg = """Dette er en åben liste til LISTDESC. * Alle kan sende til listen (ikke-tekst filtreres fra). - * Indlæg censureres for relevans (undtagen fra medlemmer og SENDERS). + * Indlæg censureres for relevans (undtagen fra SENDERS). * Alle kan tilmelde sig listen (kun medlemmer kan se medlemsliste). Adgangsbegrænsning til arkiv modvirker registrering i søgemaskiner, men -- cgit v1.2.3 From c09162e5a3258c2bf72e292e156c8e44e1527389 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 11 Nov 2010 10:32:05 +0100 Subject: Fix make senders an unconditional 4th argument to mklist(). --- mailman/mklist.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mailman/mklist.inc b/mailman/mklist.inc index 3219f66..f4dba3c 100644 --- a/mailman/mklist.inc +++ b/mailman/mklist.inc @@ -20,6 +20,7 @@ mklist() { list="$1"; shift type="$1"; shift desc="$1"; shift + senders="$1"; shift lang="${1:-$LISTLANG}" owner="${2:-$OWNER}" emailhost="${3:-$LISTDOMAIN}" @@ -28,7 +29,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" LISTHOST="$emailhost" "$sharedir/mklist.pl" "$skeldir/$type.$lang.py" > "$list.py" + LISTNAME="$list" LISTDESC="$desc" SENDERS="$senders" LISTOWNER="$owner" 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" } -- cgit v1.2.3