From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Dec 2013 14:00:14 +0000 (+0100)
Subject: Use a different From, Cc the bulk-sink, and set Reply-To
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f4c8ce78caba64b9a6aa76a89c7debcf98ccbb90;p=mirror%2Fdsa-puppet.git

Use a different From, Cc the bulk-sink, and set Reply-To
---

diff --git a/modules/porterbox/files/mail-big-homedirs b/modules/porterbox/files/mail-big-homedirs
index 41f6a25b3..da12c28f7 100755
--- a/modules/porterbox/files/mail-big-homedirs
+++ b/modules/porterbox/files/mail-big-homedirs
@@ -54,9 +54,10 @@ REPORT_SIZES = [
     { 'days': 150, 'size': 10 }
   ]
 USER_EXCLUSION_LIST = ['lost+found']
-MAIL_FROM = 'dsa@debian.org'
+MAIL_FROM = 'debian-admin (via Cron) <bulk@admin.debian.org>'
 MAIL_TO = '{username}@{hostname}.debian.org'
-MAIL_CC = ''
+MAIL_CC = 'debian-admin (bulk sink) <bulk@admin.debian.org>'
+MAIL_REPLYTO = 'debian-admin <dsa@debian.org>'
 MAIL_SUBJECT = 'Please clean up ~{username} on {hostname}.debian.org'
 MAIL_TEXT = u"""\
 Hi {name},
@@ -72,6 +73,8 @@ If you currently do not use {hostname}, please keep ~{username} under 10MB.
 
 Thanks,
 Cron, on behalf of your catherders/admins
+
+PS: replies not required.
 """
 
 class Error(Exception):
@@ -153,7 +156,8 @@ class HomedirReminder(object):
     msg = email.mime.text.MIMEText(MAIL_TEXT.format(**kwargs), _charset='UTF-8')
     msg['From'] = MAIL_FROM.format(**kwargs)
     msg['To'] = MAIL_TO.format(**kwargs)
-    msg['Cc'] = MAIL_CC.format(**kwargs)
+    if MAIL_CC != "": msg['Cc'] = MAIL_CC.format(**kwargs)
+    if MAIL_REPLYTO != "": msg['Reply-To'] = MAIL_REPLYTO.format(**kwargs)
     msg['Subject'] = MAIL_SUBJECT.format(**kwargs)
     msg['Precedence'] = "bulk"
     msg['Auto-Submitted'] = "auto-generated by mail-big-homedirs"