aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/MTA
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2010-05-10 14:47:36 -0700
committerMark Sapiro <mark@msapiro.net>2010-05-10 14:47:36 -0700
commit30bcc291af91bcea7293a09197e4cb03b7a9bf5a (patch)
treef813f9da5c6cc0fb28f0066cd9d80248c4db942b /Mailman/MTA
parent19d9f08506570461788033406ea7f662f3f21aeb (diff)
downloadmailman2-30bcc291af91bcea7293a09197e4cb03b7a9bf5a.tar.gz
mailman2-30bcc291af91bcea7293a09197e4cb03b7a9bf5a.tar.xz
mailman2-30bcc291af91bcea7293a09197e4cb03b7a9bf5a.zip
Provided the ability to specify in mm_cfg.py a local domain (e.g.
'localhost') for the local addresses in the generated virtual-mailman when MTA = 'Postfix'. See VIRTUAL_MAILMAN_LOCAL_DOMAIN in Defaults.py. Bug #328907.
Diffstat (limited to 'Mailman/MTA')
-rw-r--r--Mailman/MTA/Postfix.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/Mailman/MTA/Postfix.py b/Mailman/MTA/Postfix.py
index daa9692f..0d729188 100644
--- a/Mailman/MTA/Postfix.py
+++ b/Mailman/MTA/Postfix.py
@@ -146,8 +146,12 @@ def _addvirtual(mlist, fp):
# Now add all the standard alias entries
for k, v in makealiases(listname):
fqdnaddr = '%s@%s' % (k, hostname)
+ if mm_cfg.VIRTUAL_MAILMAN_LOCAL_DOMAIN:
+ localaddr = '%s@%s' % (k, mm_cfg.VIRTUAL_MAILMAN_LOCAL_DOMAIN)
+ else:
+ localaddr = k
# Format the text file nicely
- print >> fp, fqdnaddr, ((fieldsz - len(k)) * ' '), k
+ print >> fp, fqdnaddr, ((fieldsz - len(k)) * ' '), localaddr
# Finish the text file stanza
print >> fp, '# STANZA END:', listname
print >> fp