diff options
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. <ul><li>Enhver kan sende til listen. diff --git a/mailman/skel/closed-private.de.py b/mailman/skel/closed-private.de.py index e98bb43..c4aa8d3 100644 --- a/mailman/skel/closed-private.de.py +++ b/mailman/skel/closed-private.de.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (zensiert, geschlossene Gruppe, privat Archiv)' info = """Geschlossene Liste für LISTDESC. <ul><li>Jeder kann an die Liste senden. diff --git a/mailman/skel/closed-private.en.py b/mailman/skel/closed-private.en.py index ef40825..7f9f17f 100644 --- a/mailman/skel/closed-private.en.py +++ b/mailman/skel/closed-private.en.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censored, closed group, private archive)' info = """Closed list for LISTDESC. <ul><li>Anyone can send to the list. diff --git a/mailman/skel/closed-private.no.py b/mailman/skel/closed-private.no.py index 5b654f8..ee8010b 100644 --- a/mailman/skel/closed-private.no.py +++ b/mailman/skel/closed-private.no.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. <ul><li>Enhver kan sende til listen. diff --git a/mailman/skel/closed-private.sv.py b/mailman/skel/closed-private.sv.py index 41dd93a..9908d89 100644 --- a/mailman/skel/closed-private.sv.py +++ b/mailman/skel/closed-private.sv.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. <ul><li>Enhver kan sende til listen. diff --git a/mailman/skel/closed-unarchived.da.py b/mailman/skel/closed-unarchived.da.py index 9556744..add926e 100644 --- a/mailman/skel/closed-unarchived.da.py +++ b/mailman/skel/closed-unarchived.da.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, lukket gruppe, intet arkiv)' info = """Lukket liste til LISTDESC. <ul><li>Enhver kan sende til listen. diff --git a/mailman/skel/closed-unarchived.de.py b/mailman/skel/closed-unarchived.de.py index 87af1a3..65bb95b 100644 --- a/mailman/skel/closed-unarchived.de.py +++ b/mailman/skel/closed-unarchived.de.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (zensiert, geschlossene Gruppe, kein Archiv)' info = """Geschlossene Liste für LISTDESC. <ul><li>Jeder kann an die Liste senden. diff --git a/mailman/skel/closed-unarchived.en.py b/mailman/skel/closed-unarchived.en.py index f913671..62353a3 100644 --- a/mailman/skel/closed-unarchived.en.py +++ b/mailman/skel/closed-unarchived.en.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censored, closed group, no archive)' info = """Closed list for LISTDESC. <ul><li>Anyone can send to the list. diff --git a/mailman/skel/closed-unarchived.no.py b/mailman/skel/closed-unarchived.no.py index cdcc73c..f5a125d 100644 --- a/mailman/skel/closed-unarchived.no.py +++ b/mailman/skel/closed-unarchived.no.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, lukket gruppe, intet arkiv)' info = """Lukket liste til LISTDESC. <ul><li>Enhver kan sende til listen. diff --git a/mailman/skel/closed-unarchived.sv.py b/mailman/skel/closed-unarchived.sv.py index 471ff4b..a36817b 100644 --- a/mailman/skel/closed-unarchived.sv.py +++ b/mailman/skel/closed-unarchived.sv.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, lukket gruppe, intet arkiv)' info = """Lukket liste til LISTDESC. <ul><li>Enhver kan sende til listen. diff --git a/mailman/skel/open-announce-semi-public.da.py b/mailman/skel/open-announce-semi-public.da.py index 905bd81..6be15eb 100644 --- a/mailman/skel/open-announce-semi-public.da.py +++ b/mailman/skel/open-announce-semi-public.da.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, kun annoncering, semi-offentligt arkiv)' info = """Åben liste til LISTDESC. <ul><li>Kun SENDERS kan sende til listen. diff --git a/mailman/skel/open-announce-semi-public.de.py b/mailman/skel/open-announce-semi-public.de.py index d8496fb..329ee6c 100644 --- a/mailman/skel/open-announce-semi-public.de.py +++ b/mailman/skel/open-announce-semi-public.de.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (zensiert, nur ankündung, halböffentlich Archiv)' info = """Offene Liste für LISTDESC. <ul><li>Nur SENDERS können an die Liste senden. diff --git a/mailman/skel/open-announce-semi-public.en.py b/mailman/skel/open-announce-semi-public.en.py index d7b5d3b..c922142 100644 --- a/mailman/skel/open-announce-semi-public.en.py +++ b/mailman/skel/open-announce-semi-public.en.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censored, announce-only, semi-public archive)' info = """Open list for LISTDESC. <ul><li>Only SENDERS can send to the list. diff --git a/mailman/skel/open-announce-semi-public.no.py b/mailman/skel/open-announce-semi-public.no.py index 5e09abf..54df5d8 100644 --- a/mailman/skel/open-announce-semi-public.no.py +++ b/mailman/skel/open-announce-semi-public.no.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, kun annoncering, semi-offentligt arkiv)' info = """Åben liste til LISTDESC. <ul><li>Kun SENDERS kan sende til listen. diff --git a/mailman/skel/open-announce-semi-public.sv.py b/mailman/skel/open-announce-semi-public.sv.py index da9bf15..5b2603e 100644 --- a/mailman/skel/open-announce-semi-public.sv.py +++ b/mailman/skel/open-announce-semi-public.sv.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, kun annoncering, semi-offentligt arkiv)' info = """Åben liste til LISTDESC. <ul><li>Kun SENDERS kan sende til listen. diff --git a/mailman/skel/open-announce-unarchived.da.py b/mailman/skel/open-announce-unarchived.da.py index fa3d4f9..e8d340a 100644 --- a/mailman/skel/open-announce-unarchived.da.py +++ b/mailman/skel/open-announce-unarchived.da.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, kun annoncering, intet arkiv)' info = """Åben liste til LISTDESC. <ul><li>Kun SENDERS kan sende til listen. diff --git a/mailman/skel/open-announce-unarchived.de.py b/mailman/skel/open-announce-unarchived.de.py index 0fa2290..c1c5304 100644 --- a/mailman/skel/open-announce-unarchived.de.py +++ b/mailman/skel/open-announce-unarchived.de.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (zensiert, nur ankündung, kein Archiv)' info = """Offene Liste für LISTDESC. <ul><li>Nur SENDERS können an die Liste senden. diff --git a/mailman/skel/open-announce-unarchived.en.py b/mailman/skel/open-announce-unarchived.en.py index 0299ef1..bdadfd7 100644 --- a/mailman/skel/open-announce-unarchived.en.py +++ b/mailman/skel/open-announce-unarchived.en.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censored, announce-only, no archive)' info = """Open list for LISTDESC. <ul><li>Only SENDERS can send to the list. diff --git a/mailman/skel/open-announce-unarchived.no.py b/mailman/skel/open-announce-unarchived.no.py index f115de1..ba2ba3f 100644 --- a/mailman/skel/open-announce-unarchived.no.py +++ b/mailman/skel/open-announce-unarchived.no.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, kun annoncering, intet arkiv)' info = """Åben liste til LISTDESC. <ul><li>Kun SENDERS kan sende til listen. diff --git a/mailman/skel/open-announce-unarchived.sv.py b/mailman/skel/open-announce-unarchived.sv.py index 08dc339..12ea94d 100644 --- a/mailman/skel/open-announce-unarchived.sv.py +++ b/mailman/skel/open-announce-unarchived.sv.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, kun annoncering, intet arkiv)' info = """Åben liste til LISTDESC. <ul><li>Kun SENDERS kan sende til listen. diff --git a/mailman/skel/open-public.da.py b/mailman/skel/open-public.da.py index 9f56eb9..3b95ae3 100644 --- a/mailman/skel/open-public.da.py +++ b/mailman/skel/open-public.da.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, offentligt arkiv)' info = """Åben liste til LISTDESC. <ul><li>Alle kan sende til listen. diff --git a/mailman/skel/open-public.de.py b/mailman/skel/open-public.de.py index 5668a95..356563a 100644 --- a/mailman/skel/open-public.de.py +++ b/mailman/skel/open-public.de.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (zensiert, öffentlich Archiv)' info = """Offene Liste für LISTDESC. <ul><li>Jeder kann an die Liste senden. diff --git a/mailman/skel/open-public.en.py b/mailman/skel/open-public.en.py index dff7a45..97e42dd 100644 --- a/mailman/skel/open-public.en.py +++ b/mailman/skel/open-public.en.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censored, public archive)' info = """Open list for LISTDESC. <ul><li>Anyone can send to the list. diff --git a/mailman/skel/open-public.no.py b/mailman/skel/open-public.no.py index f41b59f..b49de59 100644 --- a/mailman/skel/open-public.no.py +++ b/mailman/skel/open-public.no.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, offentligt arkiv)' info = """Åben liste til LISTDESC. <ul><li>Alle kan sende til listen. diff --git a/mailman/skel/open-public.sv.py b/mailman/skel/open-public.sv.py index 95166d4..a389c20 100644 --- a/mailman/skel/open-public.sv.py +++ b/mailman/skel/open-public.sv.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, offentligt arkiv)' info = """Åben liste til LISTDESC. <ul><li>Alle kan sende til listen. diff --git a/mailman/skel/open-semi-public.da.py b/mailman/skel/open-semi-public.da.py index ef942ae..dad0cce 100644 --- a/mailman/skel/open-semi-public.da.py +++ b/mailman/skel/open-semi-public.da.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, semi-offentligt arkiv)' info = """Åben liste til LISTDESC. <ul><li>Alle kan sende til listen. diff --git a/mailman/skel/open-semi-public.de.py b/mailman/skel/open-semi-public.de.py index e4d8248..add9501 100644 --- a/mailman/skel/open-semi-public.de.py +++ b/mailman/skel/open-semi-public.de.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (zensiert, halböffentlich Archiv)' info = """Offene Liste für LISTDESC. <ul><li>Jeder kann an die Liste senden. diff --git a/mailman/skel/open-semi-public.en.py b/mailman/skel/open-semi-public.en.py index 71fd29c..44deaef 100644 --- a/mailman/skel/open-semi-public.en.py +++ b/mailman/skel/open-semi-public.en.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censored, semi-public archive)' info = """Open list for LISTDESC. <ul><li>Anyone can send to the list. diff --git a/mailman/skel/open-semi-public.no.py b/mailman/skel/open-semi-public.no.py index 23513ee..c8696ce 100644 --- a/mailman/skel/open-semi-public.no.py +++ b/mailman/skel/open-semi-public.no.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, semi-offentligt arkiv)' info = """Åben liste til LISTDESC. <ul><li>Alle kan sende til listen. diff --git a/mailman/skel/open-semi-public.sv.py b/mailman/skel/open-semi-public.sv.py index 5a3d3b9..d35c67e 100644 --- a/mailman/skel/open-semi-public.sv.py +++ b/mailman/skel/open-semi-public.sv.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, semi-offentligt arkiv)' info = """Åben liste til LISTDESC. <ul><li>Alle kan sende til listen. diff --git a/mailman/skel/open-unarchived.da.py b/mailman/skel/open-unarchived.da.py index 375393b..c5ed287 100644 --- a/mailman/skel/open-unarchived.da.py +++ b/mailman/skel/open-unarchived.da.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, intet arkiv)' info = """Åben liste til LISTDESC. <ul><li>Alle kan sende til listen. diff --git a/mailman/skel/open-unarchived.de.py b/mailman/skel/open-unarchived.de.py index 3835241..f5fbf8a 100644 --- a/mailman/skel/open-unarchived.de.py +++ b/mailman/skel/open-unarchived.de.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (zensiert, kein Archiv)' info = """Offene Liste für LISTDESC. <ul><li>Jeder kann an die Liste senden. diff --git a/mailman/skel/open-unarchived.en.py b/mailman/skel/open-unarchived.en.py index 3825948..b93edf7 100644 --- a/mailman/skel/open-unarchived.en.py +++ b/mailman/skel/open-unarchived.en.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censored, no archive)' info = """Open list for LISTDESC. <ul><li>Anyone can send to the list. diff --git a/mailman/skel/open-unarchived.no.py b/mailman/skel/open-unarchived.no.py index d2bab56..749ec3e 100644 --- a/mailman/skel/open-unarchived.no.py +++ b/mailman/skel/open-unarchived.no.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, intet arkiv)' info = """Åben liste til LISTDESC. <ul><li>Alle kan sende til listen. diff --git a/mailman/skel/open-unarchived.sv.py b/mailman/skel/open-unarchived.sv.py index c115475..b61c1ba 100644 --- a/mailman/skel/open-unarchived.sv.py +++ b/mailman/skel/open-unarchived.sv.py @@ -10,7 +10,7 @@ # real_name = 'LISTNAME' owner = [LISTOWNERS] -moderator = [] +moderator = [MODERATORS] description = 'LISTDESC (censureret, intet arkiv)' info = """Åben liste til LISTDESC. <ul><li>Alle kan sende til listen. |