summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2011-04-14 11:25:47 +0800
committerJeremy Kerr <jk@ozlabs.org>2011-04-14 17:24:31 +0800
commit017f73b059aadfce30ee29d2aceeab92739105a6 (patch)
tree54e00613f7bf15ad2ec93ea124fc4119c7bb23ad /apps
parentf94d40159168d0811de576328b77fd2a553039af (diff)
downloadpatchwork-017f73b059aadfce30ee29d2aceeab92739105a6.tar.bz2
patchwork-017f73b059aadfce30ee29d2aceeab92739105a6.tar.xz
notifications: Add NOTIFICATION_FROM_EMAIL setting
Allow a separate From: address for notificaton emails. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'apps')
-rw-r--r--apps/patchwork/utils.py2
-rw-r--r--apps/settings.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/apps/patchwork/utils.py b/apps/patchwork/utils.py
index 94b3f53..58edb19 100644
--- a/apps/patchwork/utils.py
+++ b/apps/patchwork/utils.py
@@ -181,7 +181,7 @@ def send_notifications():
context)
message = EmailMessage(subject = subject, body = content,
- from_email = settings.DEFAULT_FROM_EMAIL,
+ from_email = settings.NOTIFICATION_FROM_EMAIL,
to = [recipient.email],
headers = {'Precedence': 'bulk'})
diff --git a/apps/settings.py b/apps/settings.py
index d5595e0..4432f3f 100644
--- a/apps/settings.py
+++ b/apps/settings.py
@@ -104,6 +104,7 @@ DEFAULT_FROM_EMAIL = 'Patchwork <patchwork@patchwork.example.com>'
CONFIRMATION_VALIDITY_DAYS = 7
NOTIFICATION_DELAY_MINUTES = 10
+NOTIFICATION_FROM_EMAIL = DEFAULT_FROM_EMAIL
# Set to True to enable the Patchwork XML-RPC interface
ENABLE_XMLRPC = False