From c2c6a408c7764fa29389ce160f52776c9308d50a Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Sun, 31 Oct 2010 19:29:29 -0400 Subject: registration: use EmailConfimation rather than separate registration app Since we have infrastructure for email confirmations, we no longer need the separate registration app. Requires a migration script, which will delete all inactive users, including those newly added and pending confirmation. Use carefully. Signed-off-by: Jeremy Kerr --- docs/INSTALL | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'docs') diff --git a/docs/INSTALL b/docs/INSTALL index 4c178ef..6a1a0bf 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -81,17 +81,6 @@ in brackets): cd ../python ln -s ../packages/django/django ./django - We also use the django-registration infrastructure from - http://bitbucket.org/ubernostrum/django-registration/. Your distro - may provide the django-registration python module (in Ubuntu/Debian it's - called 'python-django-registration'). If not, download the module - and symlink it to lib/python/ : - - cd lib/packages/ - hg clone http://bitbucket.org/ubernostrum/django-registration/ - cd ../python - ln -s ../packages/django-registration/registration ./registration - We also use some Javascript libraries: cd lib/packages -- cgit v1.3 From 017f73b059aadfce30ee29d2aceeab92739105a6 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Thu, 14 Apr 2011 11:25:47 +0800 Subject: notifications: Add NOTIFICATION_FROM_EMAIL setting Allow a separate From: address for notificaton emails. Signed-off-by: Jeremy Kerr --- apps/patchwork/utils.py | 2 +- apps/settings.py | 1 + docs/INSTALL | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'docs') 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 ' 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 diff --git a/docs/INSTALL b/docs/INSTALL index 6a1a0bf..050fc9f 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -104,6 +104,8 @@ in brackets): ADMINS TIME_ZONE LANGUAGE_CODE + DEFAULT_FROM_EMAIL + NOTIFICATION_FROM_EMAIL You can generate the SECRET_KEY with the following python code: -- cgit v1.3