aboutsummaryrefslogtreecommitdiffstats
path: root/cron/mailpasswds
diff options
context:
space:
mode:
authorJim Popovitch <jimpop@gmail.com>2013-03-03 15:56:11 -0500
committerJim Popovitch <jimpop@gmail.com>2013-03-03 15:56:11 -0500
commite4302599c58732d14e2c901092b5e8df13c3f46e (patch)
tree449f14bc9a221c8c717bf923f13c2bffefd14fec /cron/mailpasswds
parentee4bef0ca47fa6c7b5f1874d254572667c12f164 (diff)
downloadmailman2-e4302599c58732d14e2c901092b5e8df13c3f46e.tar.gz
mailman2-e4302599c58732d14e2c901092b5e8df13c3f46e.tar.xz
mailman2-e4302599c58732d14e2c901092b5e8df13c3f46e.zip
Send monthly password reminders from virtual list(s), not sitelist
Diffstat (limited to '')
-rwxr-xr-xcron/mailpasswds10
1 files changed, 4 insertions, 6 deletions
diff --git a/cron/mailpasswds b/cron/mailpasswds
index da643761..831e9ab0 100755
--- a/cron/mailpasswds
+++ b/cron/mailpasswds
@@ -141,7 +141,9 @@ def main():
for host in byhost.keys():
# Site owner is `mailman@dom.ain'
userinfo = {}
+ virtlist = {}
for mlist in byhost[host]:
+ virtlist = mlist
listaddr = mlist.GetListEmail()
for member in mlist.getMembers():
# The user may have disabled reminders for this list
@@ -218,7 +220,7 @@ def main():
# Add the table to the end so it doesn't get wrapped/filled
text += (header + '\n' + NL.join(table))
msg = Message.UserNotification(
- addr, siteowner,
+ addr, sitebounce,
_('%(host)s mailing list memberships reminder'),
text.encode(enc, 'replace'), poplang)
# Note that text must be encoded into 'enc' because unicode
@@ -228,11 +230,7 @@ def main():
msg['X-No-Archive'] = 'yes'
del msg['auto-submitted']
msg['Auto-Submitted'] = 'auto-generated'
- # We want to make this look like it's coming from the siteowner's
- # list, but we also want to be sure that the apparent host name is
- # the current virtual host. Look in CookHeaders.py for why this
- # trick works. Blarg.
- msg.send(sitelist, **{'errorsto': sitebounce,
+ msg.send(virtlist, **{'errorsto': sitebounce,
'_nolist' : 1,
'verp' : mm_cfg.VERP_PASSWORD_REMINDERS,
})