Add mailman@domain entries for virtual domains to data/virtual-mailman.

2 files changed, 45 insertions, 2 deletions

diff --git a/Mailman/MTA/Postfix.py b/Mailman/MTA/Postfix.py
index 9987e4cf..3f5c9984 100644
--- a/Mailman/MTA/Postfix.py
+++ b/Mailman/MTA/Postfix.py
@@ -127,10 +127,13 @@ def _addvirtual(mlist, fp):
     # Set up the mailman-loop address
     loopaddr = Utils.get_site_email(mlist.host_name, extra='loop')
     loopdest = Utils.ParseEmail(loopaddr)[0]
+    # And the site list posting address.
+    siteaddr = Utils.get_site_email(mlist.host_name)
+    sitedest = Utils.ParseEmail(siteaddr)[0]
     if mm_cfg.VIRTUAL_MAILMAN_LOCAL_DOMAIN:
         loopdest += '@' + mm_cfg.VIRTUAL_MAILMAN_LOCAL_DOMAIN
     # Seek to the end of the text file, but if it's empty write the standard
-    # disclaimer, and the loop catch address.
+    # disclaimer, and the loop catch address and site address.
     fp.seek(0, 2)
     if not fp.tell():
         print >> fp, """\
@@ -145,7 +148,13 @@ def _addvirtual(mlist, fp):
 # LOOP ADDRESSES START
 %s\t%s
 # LOOP ADDRESSES END
-""" % (loopaddr, loopdest)
+
+# We also add the site list address in each virtual domain as that address
+# is exposed on admin and listinfo overviews.
+# SITE ADDRESSES START
+%s\t%s
+# SITE ADDRESSES END
+""" % (loopaddr, loopdest, siteaddr, sitedest)
     # The text file entries get a little extra info
     print >> fp, '# STANZA START:', listname
     print >> fp, '# CREATED:', time.ctime(time.time())
@@ -168,6 +177,8 @@ def _addvirtual(mlist, fp):
 def _check_for_virtual_loopaddr(mlist, filename):
     loopaddr = Utils.get_site_email(mlist.host_name, extra='loop')
     loopdest = Utils.ParseEmail(loopaddr)[0]
+    siteaddr = Utils.get_site_email(mlist.host_name)
+    sitedest = Utils.ParseEmail(siteaddr)[0]
     infp = open(filename)
     omask = os.umask(007)
     try:
@@ -200,6 +211,32 @@ def _check_for_virtual_loopaddr(mlist, filename):
             else:
                 # This isn't our loop address, so spit it out and continue
                 outfp.write(line)
+        # Now do it all again for the site list address. It must follow the
+        # loop addresses.
+        while True:
+            line = infp.readline()
+            if not line:
+                break
+            outfp.write(line)
+            if line.startswith('# SITE ADDRESSES START'):
+                break
+        # Now see if our domain has already been written
+        while True:
+            line = infp.readline()
+            if not line:
+                break
+            if line.startswith('# SITE ADDRESSES END'):
+                # It hasn't
+                print >> outfp, '%s\t%s' % (siteaddr, sitedest)
+                outfp.write(line)
+                break
+            elif line.startswith(siteaddr):
+                # We just found it
+                outfp.write(line)
+                break
+            else:
+                # This isn't our loop address, so spit it out and continue
+                outfp.write(line)
         outfp.writelines(infp.readlines())
     finally:
         infp.close()
diff --git a/NEWS b/NEWS
index 343a1b04..7f40698c 100755
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,12 @@ Here is a history of user visible changes to Mailman.
 
   Bug fixes and other patches
 
+    - Mailman-Postfix integration will now add mailman@domain entries in
+      data/virtual-mailman for each domain in POSTFIX_STYLE_VIRTUAL_DOMAINS
+      which is a host_name of a list.  This is so the addresses which are
+      exposed on admin and listinfo overview pages of virtual domains will
+      be deliverable.  (LP: #1459236)
+
     - The vette log entry for DMARC policy hits now contains the list name.
       (LP: #1450826)