From fe788bc3055e553a768422de6d37b05ad6e00de6 Mon Sep 17 00:00:00 2001 From: Fred Smith Date: Mon, 23 May 2016 09:56:16 -0400 Subject: [PATCH 1/2] override SES email region and endpoint --- cms/envs/aws.py | 3 +++ lms/envs/aws.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 9f172096a6..d4bc7fcbb6 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -266,6 +266,9 @@ if 'DJFS' in AUTH_TOKENS and AUTH_TOKENS['DJFS'] is not None: EMAIL_HOST_USER = AUTH_TOKENS.get('EMAIL_HOST_USER', EMAIL_HOST_USER) EMAIL_HOST_PASSWORD = AUTH_TOKENS.get('EMAIL_HOST_PASSWORD', EMAIL_HOST_PASSWORD) +AWS_SES_REGION_NAME = ENV_TOKENS.get('AWS_SES_REGION_NAME', 'us-east-1') +AWS_SES_REGION_ENDPOINT = ENV_TOKENS.get('AWS_SES_REGION_ENDPOINT', 'email-smtp.us-east-1.amazonaws.com') + # Note that this is the Studio key for Segment. There is a separate key for the LMS. CMS_SEGMENT_KEY = AUTH_TOKENS.get('SEGMENT_KEY') diff --git a/lms/envs/aws.py b/lms/envs/aws.py index b91777d21e..0a73353358 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -159,6 +159,9 @@ SESSION_COOKIE_HTTPONLY = ENV_TOKENS.get('SESSION_COOKIE_HTTPONLY', True) SESSION_COOKIE_SECURE = ENV_TOKENS.get('SESSION_COOKIE_SECURE', SESSION_COOKIE_SECURE) SESSION_SAVE_EVERY_REQUEST = ENV_TOKENS.get('SESSION_SAVE_EVERY_REQUEST', SESSION_SAVE_EVERY_REQUEST) +AWS_SES_REGION_NAME = ENV_TOKENS.get('AWS_SES_REGION_NAME', 'us-east-1') +AWS_SES_REGION_ENDPOINT = ENV_TOKENS.get('AWS_SES_REGION_ENDPOINT', 'email-smtp.us-east-1.amazonaws.com') + REGISTRATION_EXTRA_FIELDS = ENV_TOKENS.get('REGISTRATION_EXTRA_FIELDS', REGISTRATION_EXTRA_FIELDS) REGISTRATION_EXTENSION_FORM = ENV_TOKENS.get('REGISTRATION_EXTENSION_FORM', REGISTRATION_EXTENSION_FORM) REGISTRATION_EMAIL_PATTERNS_ALLOWED = ENV_TOKENS.get('REGISTRATION_EMAIL_PATTERNS_ALLOWED') From 8a9df36809aa487e362bb4fd5d7b462bdf92ccdf Mon Sep 17 00:00:00 2001 From: Fred Smith Date: Mon, 23 May 2016 11:01:59 -0400 Subject: [PATCH 2/2] update django-ses --- lms/envs/aws.py | 2 +- requirements/edx/base.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 0a73353358..c4889372af 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -160,7 +160,7 @@ SESSION_COOKIE_SECURE = ENV_TOKENS.get('SESSION_COOKIE_SECURE', SESSION_COOKIE_S SESSION_SAVE_EVERY_REQUEST = ENV_TOKENS.get('SESSION_SAVE_EVERY_REQUEST', SESSION_SAVE_EVERY_REQUEST) AWS_SES_REGION_NAME = ENV_TOKENS.get('AWS_SES_REGION_NAME', 'us-east-1') -AWS_SES_REGION_ENDPOINT = ENV_TOKENS.get('AWS_SES_REGION_ENDPOINT', 'email-smtp.us-east-1.amazonaws.com') +AWS_SES_REGION_ENDPOINT = ENV_TOKENS.get('AWS_SES_REGION_ENDPOINT', 'email.us-east-1.amazonaws.com') REGISTRATION_EXTRA_FIELDS = ENV_TOKENS.get('REGISTRATION_EXTRA_FIELDS', REGISTRATION_EXTRA_FIELDS) REGISTRATION_EXTENSION_FORM = ENV_TOKENS.get('REGISTRATION_EXTENSION_FORM', REGISTRATION_EXTENSION_FORM) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 0e87074c5c..7b2fa35e02 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -27,7 +27,7 @@ django-oauth-plus==2.2.8 django-oauth-toolkit==0.10.0 django-pipeline-forgiving==1.0.0 django-sekizai==0.8.2 -django-ses==0.7.0 +django-ses==0.7.1 django-simple-history==1.6.3 django-statici18n==1.1.5 django-storages==1.4.1