summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mailman/chains/membermod.py (renamed from src/mailman/chains/member.py)0
-rw-r--r--src/mailman/interfaces/mailinglist.py7
-rw-r--r--src/mailman/rest/docs/configuration.txt10
3 files changed, 14 insertions, 3 deletions
diff --git a/src/mailman/chains/member.py b/src/mailman/chains/membermod.py
index 4a220b59d..4a220b59d 100644
--- a/src/mailman/chains/member.py
+++ b/src/mailman/chains/membermod.py
diff --git a/src/mailman/interfaces/mailinglist.py b/src/mailman/interfaces/mailinglist.py
index 41eef81c8..882afaf42 100644
--- a/src/mailman/interfaces/mailinglist.py
+++ b/src/mailman/interfaces/mailinglist.py
@@ -468,6 +468,13 @@ class IMailingList(Interface):
owner or moderator.
""")
+ member_moderation_action = Attribute(
+ """Action to take when a moderated member posts to the mailing list.
+
+ This is applied when the sender is a member of the mailing list and
+ has their `is_moderated` flag set.
+ """)
+
class IAcceptableAlias(Interface):
diff --git a/src/mailman/rest/docs/configuration.txt b/src/mailman/rest/docs/configuration.txt
index 7cf1ce540..2269357ca 100644
--- a/src/mailman/rest/docs/configuration.txt
+++ b/src/mailman/rest/docs/configuration.txt
@@ -98,8 +98,8 @@ all the writable attributes in one request.
... convert_html_to_plaintext=True,
... collapse_alternatives=False,
... reply_goes_to_list='point_to_list',
- ... send_welcome_msg=True,
- ... welcome_msg='welcome message',
+ ... send_welcome_msg=False,
+ ... welcome_msg='Welcome!',
... member_moderation_action='reject',
... default_member_moderation=True,
... generic_nonmember_action=2,
@@ -140,12 +140,16 @@ These values are changed permanently.
include_list_post_header: False
include_rfc2369_headers: False
...
+ member_moderation_action: reject
+ ...
pipeline: virgin
...
real_name: Fnords
reply_goes_to_list: point_to_list
...
- welcome_msg: welcome message
+ send_welcome_msg: False
+ ...
+ welcome_msg: Welcome!
If you use ``PUT`` to change a list's configuration, all writable attributes
must be included. It is an error to leave one or more out...