Merge pull request #625 in RMS/api-main-service from red-develop to product-dev

* commit 'b209633c':
  fixing email

config/settings/demo.py

@@ -34,7 +34,6 @@ DATABASES = {
 ################
 # EMAIL SETTINGS
 ################
-EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
 EMAIL_HOST = config['DEMO']['EMAIL_HOST']
 EMAIL_PORT = config['DEMO']['EMAIL_PORT']
 EMAIL_HOST_USER = config['DEMO']['EMAIL_PORT']

config/settings/dev.py

@@ -34,7 +34,6 @@ DATABASES = {
 ################
 # EMAIL SETTINGS
 ################
-EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
 EMAIL_HOST = config['DEV']['EMAIL_HOST']
 EMAIL_PORT = config['DEV']['EMAIL_PORT']
 EMAIL_HOST_USER = config['DEV']['EMAIL_PORT']

config/settings/local.py

@@ -31,7 +31,6 @@ DATABASES = {
 ################
 # EMAIL SETTINGS
 ################
-EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
 EMAIL_HOST = config['LOCAL']['EMAIL_HOST']
 EMAIL_PORT = config['LOCAL']['EMAIL_PORT']
 EMAIL_HOST_USER = config['LOCAL']['EMAIL_PORT']

config/settings/sit.py

@@ -33,7 +33,6 @@ DATABASES = {
 ################
 # EMAIL SETTINGS
 ################
-EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
 EMAIL_HOST = config['SIT']['EMAIL_HOST']
 EMAIL_PORT = config['SIT']['EMAIL_PORT']
 EMAIL_HOST_USER = config['SIT']['EMAIL_PORT']