Add plural senderfilters and listowners (and read corresponding environment variables) to support arrays of strings.

12 files changed, 48 insertions, 48 deletions

diff --git a/mailman/skel/private.en.py b/mailman/skel/private.en.py
index 8a506e2..1d0e0c6 100644
--- a/mailman/skel/private.en.py
+++ b/mailman/skel/private.en.py
@@ -5,11 +5,11 @@
 # LISTDESC = list base description
 # LISTHOST = maildomain
 # SENDERS = permitted senders short description
-# SENDERFILTER = regexp of permitted senders
-# LISTOWNER = listmaster address
+# SENDERFILTERS = array of regexes of permitted senders
+# LISTOWNERS = array of listmaster address(es)
 #
 real_name = 'LISTNAME'
-owner = ['LISTOWNER']
+owner = [LISTOWNERS]
 moderator = []
 description = 'LISTDESC (censored, public)'
 info = """Closed list for LISTDESC.
@@ -85,7 +85,7 @@ obscure_addresses = 0
 default_member_moderation = 0
 member_moderation_action = 0
 member_moderation_notice = ''
-accept_these_nonmembers = ['SENDERFILTER']
+accept_these_nonmembers = [SENDERFILTERS]
 hold_these_nonmembers = []
 reject_these_nonmembers = []
 discard_these_nonmembers = []
diff --git a/mailman/skel/sig.da.py b/mailman/skel/sig.da.py
index 0baca23..2276d3c 100644
--- a/mailman/skel/sig.da.py
+++ b/mailman/skel/sig.da.py
@@ -5,11 +5,11 @@
 # LISTDESC = list base description
 # LISTHOST = maildomain
 # SENDERS = permitted senders short description
-# SENDERFILTER = regexp of permitted senders
-# LISTOWNER = listmaster address
+# SENDERFILTERS = array of regexes of permitted senders
+# LISTOWNERS = array of listmaster address(es)
 #
 real_name = 'LISTNAME'
-owner = ['LISTOWNER']
+owner = [LISTOWNERS]
 moderator = []
 description = 'LISTDESC (censureret, offentlig)'
 info = """Åben liste til LISTDESC.
@@ -85,7 +85,7 @@ obscure_addresses = 0
 default_member_moderation = 0
 member_moderation_action = 0
 member_moderation_notice = ''
-accept_these_nonmembers = ['SENDERFILTER']
+accept_these_nonmembers = [SENDERFILTERS]
 hold_these_nonmembers = []
 reject_these_nonmembers = []
 discard_these_nonmembers = []
diff --git a/mailman/skel/sig.en.py b/mailman/skel/sig.en.py
index 64b8ab3..f0eff57 100644
--- a/mailman/skel/sig.en.py
+++ b/mailman/skel/sig.en.py
@@ -5,11 +5,11 @@
 # LISTDESC = list base description
 # LISTHOST = maildomain
 # SENDERS = permitted senders short description
-# SENDERFILTER = regexp of permitted senders
-# LISTOWNER = listmaster address
+# SENDERFILTERS = array of regexes of permitted senders
+# LISTOWNERS = array of listmaster address(es)
 #
 real_name = 'LISTNAME'
-owner = ['LISTOWNER']
+owner = [LISTOWNERS]
 moderator = []
 description = 'LISTDESC (censored, public)'
 info = """Open list for LISTDESC.
@@ -85,7 +85,7 @@ obscure_addresses = 0
 default_member_moderation = 0
 member_moderation_action = 0
 member_moderation_notice = ''
-accept_these_nonmembers = ['SENDERFILTER']
+accept_these_nonmembers = [SENDERFILTERS]
 hold_these_nonmembers = []
 reject_these_nonmembers = []
 discard_these_nonmembers = []
diff --git a/mailman/skel/sig.no.py b/mailman/skel/sig.no.py
index 74ec4f6..0bbd495 100644
--- a/mailman/skel/sig.no.py
+++ b/mailman/skel/sig.no.py
@@ -5,11 +5,11 @@
 # LISTDESC = list base description
 # LISTHOST = maildomain
 # SENDERS = permitted senders short description
-# SENDERFILTER = regexp of permitted senders
-# LISTOWNER = listmaster address
+# SENDERFILTERS = array regexes of permitted senders
+# LISTOWNERS = array of listmaster address(es)
 #
 real_name = 'LISTNAME'
-owner = ['LISTOWNER']
+owner = [LISTOWNERS]
 moderator = []
 description = 'LISTDESC (censureret, offentlig)'
 info = """Åben liste til LISTDESC.
@@ -85,7 +85,7 @@ obscure_addresses = 0
 default_member_moderation = 0
 member_moderation_action = 0
 member_moderation_notice = ''
-accept_these_nonmembers = ['SENDERFILTER']
+accept_these_nonmembers = [SENDERFILTERS]
 hold_these_nonmembers = []
 reject_these_nonmembers = []
 discard_these_nonmembers = []
diff --git a/mailman/skel/team-announce.da.py b/mailman/skel/team-announce.da.py
index b7e84ba..86bd65f 100644
--- a/mailman/skel/team-announce.da.py
+++ b/mailman/skel/team-announce.da.py
@@ -5,11 +5,11 @@
 # LISTDESC = list base description
 # LISTHOST = maildomain
 # SENDERS = permitted senders short description
-# SENDERFILTER = regexp of permitted senders
-# LISTOWNER = listmaster address
+# SENDERFILTERS = array of regexes of permitted senders
+# LISTOWNERS = array of listmaster address(es)
 #
 real_name = 'LISTNAME'
-owner = ['LISTOWNER']
+owner = [LISTOWNERS]
 moderator = []
 description = 'LISTDESC (censureret, semi-offentlig)'
 info = """Åben liste til LISTDESC.
@@ -85,7 +85,7 @@ default_member_moderation = 1
 member_moderation_action = 0
 member_moderation_notice = ''
 accept_these_nonmembers = []
-hold_these_nonmembers = ['SENDERFILTER']
+hold_these_nonmembers = [SENDERFILTERS]
 reject_these_nonmembers = []
 discard_these_nonmembers = []
 generic_nonmember_action = 2
diff --git a/mailman/skel/team-announce.da.py.broken b/mailman/skel/team-announce.da.py.broken
index f602798..f353a7f 100644
--- a/mailman/skel/team-announce.da.py.broken
+++ b/mailman/skel/team-announce.da.py.broken
@@ -8,11 +8,11 @@ PYTHON_PREFIX="""#!/usr/bin/python
 # LISTDESC = list base description
 # LISTHOST = maildomain
 # SENDERS = permitted senders short description
-# SENDERFILTER = regexp of permitted senders
-# LISTOWNER = listmaster address
+# SENDERFILTERS = array of regexes of permitted senders
+# LISTOWNERS = array of listmaster address(es)
 #
 real_name = 'LISTNAME'
-owner = ['LISTOWNER']
+owner = [LISTOWNERS]
 moderator = []
 description = 'LISTDESC (censureret, semi-offentlig)'
 info = """Ã…ben liste til LISTDESC.
@@ -88,7 +88,7 @@ default_member_moderation = 1
 member_moderation_action = 0
 member_moderation_notice = ''
 accept_these_nonmembers = []
-hold_these_nonmembers = ['SENDERFILTER']
+hold_these_nonmembers = [SENDERFILTERS]
 reject_these_nonmembers = []
 discard_these_nonmembers = []
 generic_nonmember_action = 2
diff --git a/mailman/skel/team-announce.en.py b/mailman/skel/team-announce.en.py
index ef83420..f99b2de 100644
--- a/mailman/skel/team-announce.en.py
+++ b/mailman/skel/team-announce.en.py
@@ -5,11 +5,11 @@
 # LISTDESC = list base description
 # LISTHOST = maildomain
 # SENDERS = permitted senders short description
-# SENDERFILTER = regexp of permitted senders
-# LISTOWNER = listmaster address
+# SENDERFILTERS = array of regexes of permitted senders
+# LISTOWNERS = array of listmaster address(es)
 #
 real_name = 'LISTNAME'
-owner = ['LISTOWNER']
+owner = [LISTOWNERS]
 moderator = []
 description = 'LISTDESC (censored, semi-public)'
 info = """Open list for LISTDESC.
@@ -85,7 +85,7 @@ default_member_moderation = 1
 member_moderation_action = 0
 member_moderation_notice = ''
 accept_these_nonmembers = []
-hold_these_nonmembers = ['SENDERFILTER']
+hold_these_nonmembers = [SENDERFILTERS]
 reject_these_nonmembers = []
 discard_these_nonmembers = []
 generic_nonmember_action = 2
diff --git a/mailman/skel/team-announce.no.py b/mailman/skel/team-announce.no.py
index 1cf88be..013771f 100644
--- a/mailman/skel/team-announce.no.py
+++ b/mailman/skel/team-announce.no.py
@@ -5,11 +5,11 @@
 # LISTDESC = list base description
 # LISTHOST = maildomain
 # SENDERS = permitted senders short description
-# SENDERFILTER = regexp of permitted senders
-# LISTOWNER = listmaster address
+# SENDERFILTERS = array of regexes of permitted senders
+# LISTOWNERS = array of listmaster address(es)
 #
 real_name = 'LISTNAME'
-owner = ['LISTOWNER']
+owner = [LISTOWNERS]
 moderator = []
 description = 'LISTDESC (censureret, semi-offentlig)'
 info = """Åben liste til LISTDESC.
@@ -85,7 +85,7 @@ default_member_moderation = 1
 member_moderation_action = 0
 member_moderation_notice = ''
 accept_these_nonmembers = []
-hold_these_nonmembers = ['SENDERFILTER']
+hold_these_nonmembers = [SENDERFILTERS]
 reject_these_nonmembers = []
 discard_these_nonmembers = []
 generic_nonmember_action = 2
diff --git a/mailman/skel/team.da.py b/mailman/skel/team.da.py
index 612cf48..488d202 100644
--- a/mailman/skel/team.da.py
+++ b/mailman/skel/team.da.py
@@ -5,11 +5,11 @@
 # LISTDESC = list base description
 # LISTHOST = maildomain
 # SENDERS = permitted senders short description
-# SENDERFILTER = regexp of permitted senders
-# LISTOWNER = listmaster address
+# SENDERFILTERS = array of regexes of permitted senders
+# LISTOWNERS = array of listmaster address(es)
 #
 real_name = 'LISTNAME'
-owner = ['LISTOWNER']
+owner = [LISTOWNERS]
 moderator = []
 description = 'LISTDESC (censureret, semi-offentlig)'
 info = """Åben liste til LISTDESC.
@@ -88,7 +88,7 @@ obscure_addresses = 0
 default_member_moderation = 0
 member_moderation_action = 0
 member_moderation_notice = ''
-accept_these_nonmembers = ['SENDERFILTER']
+accept_these_nonmembers = [SENDERFILTERS]
 hold_these_nonmembers = []
 reject_these_nonmembers = []
 discard_these_nonmembers = []
diff --git a/mailman/skel/team.da.py.broken b/mailman/skel/team.da.py.broken
index 142b5b1..7a48c31 100644
--- a/mailman/skel/team.da.py.broken
+++ b/mailman/skel/team.da.py.broken
@@ -8,11 +8,11 @@ PYTHON_PREFIX="""#!/usr/bin/python
 # LISTDESC = list base description
 # LISTHOST = maildomain
 # SENDERS = permitted senders short description
-# SENDERFILTER = regexp of permitted senders
-# LISTOWNER = listmaster address
+# SENDERFILTERS = array of regexes of permitted senders
+# LISTOWNERS = array of listmaster address(es)
 #
 real_name = 'LISTNAME'
-owner = ['LISTOWNER']
+owner = [LISTOWNERS]
 moderator = []
 description = 'LISTDESC (delvist offentlig)'
 info = """Ã…ben liste til LISTDESC.
@@ -90,7 +90,7 @@ obscure_addresses = 0
 default_member_moderation = 0
 member_moderation_action = 0
 member_moderation_notice = ''
-accept_these_nonmembers = ['SENDERFILTER']
+accept_these_nonmembers = [SENDERFILTERS]
 hold_these_nonmembers = []
 reject_these_nonmembers = []
 discard_these_nonmembers = []
diff --git a/mailman/skel/team.en.py b/mailman/skel/team.en.py
index db6e647..e66b789 100644
--- a/mailman/skel/team.en.py
+++ b/mailman/skel/team.en.py
@@ -5,11 +5,11 @@
 # LISTDESC = list base description
 # LISTHOST = maildomain
 # SENDERS = permitted senders short description
-# SENDERFILTER = regexp of permitted senders
-# LISTOWNER = listmaster address
+# SENDERFILTERS = array of regexes of permitted senders
+# LISTOWNERS = array of listmaster address(es)
 #
 real_name = 'LISTNAME'
-owner = ['LISTOWNER']
+owner = [LISTOWNERS]
 moderator = []
 description = 'LISTDESC (censored, semi-public)'
 info = """Open list for LISTDESC.
@@ -88,7 +88,7 @@ obscure_addresses = 0
 default_member_moderation = 0
 member_moderation_action = 0
 member_moderation_notice = ''
-accept_these_nonmembers = ['SENDERFILTER']
+accept_these_nonmembers = [SENDERFILTERS]
 hold_these_nonmembers = []
 reject_these_nonmembers = []
 discard_these_nonmembers = []
diff --git a/mailman/skel/team.no.py b/mailman/skel/team.no.py
index 375f414..adddf59 100644
--- a/mailman/skel/team.no.py
+++ b/mailman/skel/team.no.py
@@ -5,11 +5,11 @@
 # LISTDESC = list base description
 # LISTHOST = maildomain
 # SENDERS = permitted senders short description
-# SENDERFILTER = regexp of permitted senders
-# LISTOWNER = listmaster address
+# SENDERFILTERS = array of regexes of permitted senders
+# LISTOWNERS = array of listmaster address(es)
 #
 real_name = 'LISTNAME'
-owner = ['LISTOWNER']
+owner = [LISTOWNERS]
 moderator = []
 description = 'LISTDESC (censureret, semi-offentlig)'
 info = """Åben liste til LISTDESC.
@@ -88,7 +88,7 @@ obscure_addresses = 0
 default_member_moderation = 0
 member_moderation_action = 0
 member_moderation_notice = ''
-accept_these_nonmembers = ['SENDERFILTER']
+accept_these_nonmembers = [SENDERFILTERS]
 hold_these_nonmembers = []
 reject_these_nonmembers = []
 discard_these_nonmembers = []