From 4e641b946dd0799e2194e986026ce04b7deb89e4 Mon Sep 17 00:00:00 2001 From: Bertrand Marron Date: Wed, 11 Dec 2013 16:09:32 +0100 Subject: [PATCH 1/2] Add default email settings These are the django default settings. --- cms/envs/common.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cms/envs/common.py b/cms/envs/common.py index daea3a3f0efa..1d2dd3040838 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -197,6 +197,11 @@ # Email EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' +EMAIL_HOST = 'localhost' +EMAIL_PORT = 25 +EMAIL_USE_TLS = False +EMAIL_HOST_USER = '' +EMAIL_HOST_PASSWORD = '' DEFAULT_FROM_EMAIL = 'registration@example.com' DEFAULT_FEEDBACK_EMAIL = 'feedback@example.com' SERVER_EMAIL = 'devops@example.com' From f576673a87d610e265bf496ab81bc8b6eea6bc84 Mon Sep 17 00:00:00 2001 From: Bertrand Marron Date: Wed, 11 Dec 2013 16:01:18 +0100 Subject: [PATCH 2/2] Add email configuration to cms/envs/aws.py This allows emails to be sent by Studio. --- cms/envs/aws.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 9a37a44a929c..2ab79d336f57 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -108,6 +108,13 @@ EMAIL_BACKEND = ENV_TOKENS.get('EMAIL_BACKEND', EMAIL_BACKEND) EMAIL_FILE_PATH = ENV_TOKENS.get('EMAIL_FILE_PATH', None) + +EMAIL_HOST = ENV_TOKENS.get('EMAIL_HOST', EMAIL_HOST) +EMAIL_PORT = ENV_TOKENS.get('EMAIL_PORT', EMAIL_PORT) +EMAIL_USE_TLS = ENV_TOKENS.get('EMAIL_USE_TLS', EMAIL_USE_TLS) +EMAIL_HOST_USER = AUTH_TOKENS.get('EMAIL_HOST_USER', EMAIL_HOST_USER) +EMAIL_HOST_PASSWORD = AUTH_TOKENS.get('EMAIL_HOST_PASSWORD', EMAIL_HOST_PASSWORD) + LMS_BASE = ENV_TOKENS.get('LMS_BASE') # Note that FEATURES['PREVIEW_LMS_BASE'] gets read in from the environment file.