4 files changed, 32 insertions, 2 deletions

diff --git a/src/mailman/interfaces/mailinglist.py b/src/mailman/interfaces/mailinglist.py
index fba5d71ef..98f538dbe 100644
--- a/src/mailman/interfaces/mailinglist.py
+++ b/src/mailman/interfaces/mailinglist.py
@@ -110,6 +110,18 @@ class IMailingList(Interface):
         """Flag specifying whether to include any RFC 2369 header, including
         the RFC 2919 List-ID header.""")
 
+    anonymous_list = Attribute(
+        """Flag controlling whether messages to this list are anonymized.
+
+        Anonymizing messages is not perfect, however setting this flag removes
+        the sender of the message (in the From, Sender, and Reply-To fields)
+        and replaces these with the list's posting address.
+        """)
+
+    advertised = Attribute(
+        """Advertise this mailing list when people ask for an overview of the
+        available mailing lists.""")
+
     # Contact addresses
 
     posting_address = Attribute(
diff --git a/src/mailman/model/mailinglist.py b/src/mailman/model/mailinglist.py
index 566e24341..f81b5099a 100644
--- a/src/mailman/model/mailinglist.py
+++ b/src/mailman/model/mailinglist.py
@@ -70,6 +70,8 @@ class MailingList(Model):
     list_id = Unicode()
     include_list_post_header = Bool()
     include_rfc2369_headers = Bool()
+    advertised = Bool()
+    anonymous_list = Bool()
     # Attributes not directly modifiable via the web u/i
     created_at = DateTime()
     admin_member_chunksize = Int()
@@ -91,8 +93,6 @@ class MailingList(Model):
     admin_immed_notify = Bool()
     admin_notify_mchanges = Bool()
     administrivia = Bool()
-    advertised = Bool()
-    anonymous_list = Bool()
     archive = Bool()
     archive_private = Bool()
     archive_volume_frequency = Int()
diff --git a/src/mailman/rest/docs/configuration.txt b/src/mailman/rest/docs/configuration.txt
index dfe2c023e..dc28c5ce9 100644
--- a/src/mailman/rest/docs/configuration.txt
+++ b/src/mailman/rest/docs/configuration.txt
@@ -17,6 +17,8 @@ All readable attributes for a list are available on a sub-resource.
     ...           'test-one@example.com/config')
     admin_immed_notify: True
     admin_notify_mchanges: False
+    advertised: True
+    anonymous_list: False
     bounces_address: test-one-bounces@example.com
     collapse_alternatives: True
     convert_html_to_plaintext: False
@@ -59,6 +61,8 @@ writable attributes in one request.
     ...           dict(
     ...             admin_immed_notify=False,
     ...             admin_notify_mchanges=True,
+    ...             advertised=False,
+    ...             anonymous_list=True,
     ...             real_name='Fnords',
     ...             include_rfc2369_headers=False,
     ...             include_list_post_header=False,
@@ -80,6 +84,8 @@ These values are changed permanently.
     ...           'test-one@example.com/config')
     admin_immed_notify: False
     admin_notify_mchanges: True
+    advertised: False
+    anonymous_list: True
     ...
     collapse_alternatives: False
     convert_html_to_plaintext: True
@@ -103,6 +109,8 @@ be included.  It is an error to leave one out (e.g. `pipeline`)...
     ...           dict(
     ...             #admin_immed_notify=False,
     ...             admin_notify_mchanges=True,
+    ...             advertised=False,
+    ...             anonymous_list=True,
     ...             real_name='Fnords',
     ...             include_rfc2369_headers=False,
     ...             include_list_post_header=False,
@@ -125,6 +133,8 @@ be included.  It is an error to leave one out (e.g. `pipeline`)...
     ...             a_mailing_list_attribute=False,
     ...             admin_immed_notify=False,
     ...             admin_notify_mchanges=True,
+    ...             advertised=False,
+    ...             anonymous_list=True,
     ...             real_name='Fnords',
     ...             include_rfc2369_headers=False,
     ...             include_list_post_header=False,
@@ -146,6 +156,8 @@ It is also an error to spell an attribute value incorrectly...
     ...           dict(
     ...             admin_immed_notify='Nope',
     ...             admin_notify_mchanges=True,
+    ...             advertised=False,
+    ...             anonymous_list=True,
     ...             real_name='Fnords',
     ...             include_rfc2369_headers=False,
     ...             include_list_post_header=False,
@@ -167,6 +179,8 @@ It is also an error to spell an attribute value incorrectly...
     ...           dict(
     ...             admin_immed_notify=False,
     ...             admin_notify_mchanges=True,
+    ...             advertised=False,
+    ...             anonymous_list=True,
     ...             real_name='Fnords',
     ...             include_rfc2369_headers=False,
     ...             include_list_post_header=False,
diff --git a/src/mailman/rest/lists.py b/src/mailman/rest/lists.py
index 896198748..5d3e68200 100644
--- a/src/mailman/rest/lists.py
+++ b/src/mailman/rest/lists.py
@@ -223,6 +223,8 @@ READABLE = (
     'list_id',
     'include_list_post_header',
     'include_rfc2369_headers',
+    'advertised',
+    'anonymous_list',
     # Contact addresses.
     'posting_address',
     'no_reply_address',
@@ -265,6 +267,8 @@ VALIDATORS = {
     'real_name': unicode,
     'include_list_post_header': as_boolean,
     'include_rfc2369_headers': as_boolean,
+    'advertised': as_boolean,
+    'anonymous_list': as_boolean,
     # Digests.
     'digest_size_threshold': float,
     # Notifications.