You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/06/17 19:51:27 UTC
[airavata-django-portal] branch master updated: AIRAVATA-2638
Separate error email recipients from administrative emails for portal
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
The following commit(s) were added to refs/heads/master by this push:
new 19811a4 AIRAVATA-2638 Separate error email recipients from administrative emails for portal
19811a4 is described below
commit 19811a415c0bef8ef7d52e3fcc3fac791042e78c
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jun 17 15:51:13 2019 -0400
AIRAVATA-2638 Separate error email recipients from administrative emails for portal
---
django_airavata/apps/auth/utils.py | 2 +-
django_airavata/settings_local.py.sample | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/django_airavata/apps/auth/utils.py b/django_airavata/apps/auth/utils.py
index d1cbc2d..e8ce6d0 100644
--- a/django_airavata/apps/auth/utils.py
+++ b/django_airavata/apps/auth/utils.py
@@ -97,6 +97,6 @@ def send_new_user_email(request, username, email, first_name, last_name):
from_email="{} <{}>".format(
settings.PORTAL_TITLE,
settings.SERVER_EMAIL),
- to=[a[1] for a in settings.ADMINS])
+ to=[a[1] for a in settings.PORTAL_ADMINS])
msg.content_subtype = 'html'
msg.send()
diff --git a/django_airavata/settings_local.py.sample b/django_airavata/settings_local.py.sample
index 8f2d55e..c4f7ac9 100644
--- a/django_airavata/settings_local.py.sample
+++ b/django_airavata/settings_local.py.sample
@@ -26,7 +26,12 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# EMAIL_HOST_USER = '...'
# EMAIL_HOST_PASSWORD = '...'
# EMAIL_USE_TLS = True
+# ADMINS receive error emails
# ADMINS = [('Admin Name', 'admin@example.com')]
+# PORTAL_ADMINS receive administrative emails, like when a new user is created
+# This can be set to a different value than ADMINS so that the PORTAL_ADMINS
+# don't receive error emails
+PORTAL_ADMINS = ADMINS
# SERVER_EMAIL = 'portal@example.com'
# Keycloak Configuration