From fd7a4ab29b4b02bc45b56110a3109769059f1bfc Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 12 Nov 2020 01:15:06 +0100 Subject: support MODERATORS --- mailman/mklist.inc | 3 ++- mailman/mklist.pl | 4 +++- mailman/skel/closed-private.da.py | 2 +- mailman/skel/closed-private.de.py | 2 +- mailman/skel/closed-private.en.py | 2 +- mailman/skel/closed-private.no.py | 2 +- mailman/skel/closed-private.sv.py | 2 +- mailman/skel/closed-unarchived.da.py | 2 +- mailman/skel/closed-unarchived.de.py | 2 +- mailman/skel/closed-unarchived.en.py | 2 +- mailman/skel/closed-unarchived.no.py | 2 +- mailman/skel/closed-unarchived.sv.py | 2 +- mailman/skel/open-announce-semi-public.da.py | 2 +- mailman/skel/open-announce-semi-public.de.py | 2 +- mailman/skel/open-announce-semi-public.en.py | 2 +- mailman/skel/open-announce-semi-public.no.py | 2 +- mailman/skel/open-announce-semi-public.sv.py | 2 +- mailman/skel/open-announce-unarchived.da.py | 2 +- mailman/skel/open-announce-unarchived.de.py | 2 +- mailman/skel/open-announce-unarchived.en.py | 2 +- mailman/skel/open-announce-unarchived.no.py | 2 +- mailman/skel/open-announce-unarchived.sv.py | 2 +- mailman/skel/open-public.da.py | 2 +- mailman/skel/open-public.de.py | 2 +- mailman/skel/open-public.en.py | 2 +- mailman/skel/open-public.no.py | 2 +- mailman/skel/open-public.sv.py | 2 +- mailman/skel/open-semi-public.da.py | 2 +- mailman/skel/open-semi-public.de.py | 2 +- mailman/skel/open-semi-public.en.py | 2 +- mailman/skel/open-semi-public.no.py | 2 +- mailman/skel/open-semi-public.sv.py | 2 +- mailman/skel/open-unarchived.da.py | 2 +- mailman/skel/open-unarchived.de.py | 2 +- mailman/skel/open-unarchived.en.py | 2 +- mailman/skel/open-unarchived.no.py | 2 +- mailman/skel/open-unarchived.sv.py | 2 +- 37 files changed, 40 insertions(+), 37 deletions(-) diff --git a/mailman/mklist.inc b/mailman/mklist.inc index 12d319b..a392dd1 100644 --- a/mailman/mklist.inc +++ b/mailman/mklist.inc @@ -30,11 +30,12 @@ mklist() { owner="${2:-$OWNER}" emailhost="${3:-$LISTDOMAIN}" urlhost="${4:-${LISTWEBDOMAIN:-$emailhost}}" + moderators="${5:-${MODERATORS}}" if ! echo "$existinglists" | grep -q "^$list\$"; then newlist -l "$lang"${urlhost:+ -u "$urlhost"}${emailhost:+ -e "$emailhost"} -q "$list" "$owner" "$(mkpw)" fi - LISTNAME="$list_anycase" LISTDESC="$desc" SENDERS="$senders" LISTOWNER="$owner" LISTHOST="$emailhost" "$sharedir/mklist.pl" "$skeldir/$type.$lang.py" > "$list.py" + LISTNAME="$list_anycase" LISTDESC="$desc" SENDERS="$senders" LISTOWNER="$owner" LISTHOST="$emailhost" MODERATORS="$moderators" "$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 c787051..e1c2d06 100755 --- a/mailman/mklist.pl +++ b/mailman/mklist.pl @@ -4,7 +4,7 @@ use warnings; -our ($listname, $listdesc, $listhost, $senders, $senderfilter, $listowner); +our ($listname, $listdesc, $listhost, $senders, $senderfilter, $listowner, $moderators); # Load optional config my $config_file_addon_org = "/etc/local-ORG/mailman/mklist.conf"; @@ -23,6 +23,7 @@ $senderfilters = $ENV{'SENDERFILTER'} || $ENV{'SENDERFILTERS'} || '' or warn "Ignoring missing SENDERFILTER(S)"; $listowners = $ENV{'LISTOWNER'} || $ENV{'LISTOWNERS'} or die "LISTOWNER(S) missing"; +$moderators = $ENV{'MODERATORS'} || ''; while (<>) { # Replace keywords - except in comments @@ -33,6 +34,7 @@ while (<>) { s/^([^#]*)SENDERS/$1$senders/g; s/^([^#]*)SENDERFILTERS/$1$senderfilters/g; s/^([^#]*)LISTOWNERS/$1$listowners/g; + s/^([^#]*)MODERATORS/$1$moderators/g; print; } diff --git a/mailman/skel/closed-private.da.py b/mailman/skel/closed-private.da.py index 14d5bc3..c95c950 100644 --- a/mailman/skel/closed-private.da.py +++ b/mailman/skel/closed-private.da.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, lukket gruppe, privat arkiv)' info = """Lukket liste til LISTDESC.