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

* commit 'e89881f8':
  made email config dynamic thru env.ini

config/settings/base.py

@@ -170,11 +170,12 @@ REST_FRAMEWORK = {
 # EMAIL_DEFAULT_SENDER = 'rms.noreply@oneberrysystem.com'
 
 EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
-EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
-EMAIL_PORT = 587
-EMAIL_HOST_USER = 'AKIAYA4XVX5XFZHRQATF'
-EMAIL_HOST_PASSWORD = 'BIOG15v+WTbTiBtPKkn+LCjg0UHqO3nLFQezh4pi6g3y'
-EMAIL_USE_SSL = False
-EMAIL_USE_TLS = True
-EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_DEFAULT_SENDER = 'noreply@rms-hub.com'
+
+# EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
+# EMAIL_PORT = 587
+# EMAIL_HOST_USER = 'AKIAYA4XVX5XFZHRQATF'
+# EMAIL_HOST_PASSWORD = 'BIOG15v+WTbTiBtPKkn+LCjg0UHqO3nLFQezh4pi6g3y'
+# EMAIL_USE_SSL = False
+# EMAIL_USE_TLS = True
+# EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+# EMAIL_DEFAULT_SENDER = 'noreply@rms-hub.com'

config/settings/demo.py

@@ -31,6 +31,19 @@ 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']
+EMAIL_HOST_PASSWORD = config['DEMO']['EMAIL_HOST_PASSWORD']
+EMAIL_USE_SSL = config['DEMO']['EMAIL_USE_SSL']
+EMAIL_USE_TLS = config['DEMO']['EMAIL_USE_TLS']
+EMAIL_BACKEND = config['DEMO']['EMAIL_BACKEND']
+EMAIL_DEFAULT_SENDER = config['DEMO']['EMAIL_DEFAULT_SENDER']
+
 # ****************
 # PROGRAM SETTINGS
 # ****************

config/settings/dev.py

@@ -31,6 +31,20 @@ 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']
+EMAIL_HOST_PASSWORD = config['DEV']['EMAIL_HOST_PASSWORD']
+EMAIL_USE_SSL = config['DEV']['EMAIL_USE_SSL']
+EMAIL_USE_TLS = config['DEV']['EMAIL_USE_TLS']
+EMAIL_BACKEND = config['DEV']['EMAIL_BACKEND']
+EMAIL_DEFAULT_SENDER = config['DEV']['EMAIL_DEFAULT_SENDER']
+
+
 # ****************
 # PROGRAM SETTINGS
 # ****************

config/settings/local.py

@@ -28,6 +28,20 @@ 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']
+EMAIL_HOST_PASSWORD = config['LOCAL']['EMAIL_HOST_PASSWORD']
+EMAIL_USE_SSL = config['LOCAL']['EMAIL_USE_SSL']
+EMAIL_USE_TLS = config['LOCAL']['EMAIL_USE_TLS']
+EMAIL_BACKEND = config['LOCAL']['EMAIL_BACKEND']
+EMAIL_DEFAULT_SENDER = config['LOCAL']['EMAIL_DEFAULT_SENDER']
+
+
 # ****************
 # PROGRAM SETTINGS
 # ****************

config/settings/sit.py

@@ -30,6 +30,19 @@ 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']
+EMAIL_HOST_PASSWORD = config['SIT']['EMAIL_HOST_PASSWORD']
+EMAIL_USE_SSL = config['SIT']['EMAIL_USE_SSL']
+EMAIL_USE_TLS = config['SIT']['EMAIL_USE_TLS']
+EMAIL_BACKEND = config['SIT']['EMAIL_BACKEND']
+EMAIL_DEFAULT_SENDER = config['SIT']['EMAIL_DEFAULT_SENDER']
+
 # ****************
 # PROGRAM SETTINGS
 # ****************

env.template.ini

@@ -12,6 +12,14 @@ USER_DEFAULT_PASSWORD =
 CATCH_EMAIL = gladys@tirsolutions.com
 CR_LINK = http://staging.rms.oneberrysystem.com/cms/change-request/form/view
 REALTIMESERVER_IP = 127.0.0.1:8000
+EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
+EMAIL_PORT = 587
+EMAIL_HOST_USER = 'AKIAIPRWQKYV6N5SMLUA'
+EMAIL_HOST_PASSWORD = 'ApK1dtH2qpT/oMl9MEauFvyN9XZDQ1fjzd8TumIs71NG'
+EMAIL_USE_SSL = False
+EMAIL_USE_TLS = True
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+EMAIL_DEFAULT_SENDER = 'rms.noreply@oneberrysystem.com'
 
 
 [DEV]
@@ -28,6 +36,14 @@ USER_DEFAULT_PASSWORD =
 CATCH_EMAIL = gladys@tirsolutions.com
 CR_LINK = http://devweb.rmsv2.oneberrysystem.com/cms/change-request/form/view
 REALTIMESERVER_IP = 127.0.0.1:8000
+EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
+EMAIL_PORT = 587
+EMAIL_HOST_USER = 'AKIAIPRWQKYV6N5SMLUA'
+EMAIL_HOST_PASSWORD = 'ApK1dtH2qpT/oMl9MEauFvyN9XZDQ1fjzd8TumIs71NG'
+EMAIL_USE_SSL = False
+EMAIL_USE_TLS = True
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+EMAIL_DEFAULT_SENDER = 'rms.noreply@oneberrysystem.com'
 
 
 [STAGING]
@@ -44,6 +60,14 @@ USER_DEFAULT_PASSWORD = password
 CATCH_EMAIL = 
 CR_LINK = http://staging.rms.oneberrysystem.com/cms/change-request/form/view
 REALTIMESERVER_IP = 127.0.0.1:8000
+EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
+EMAIL_PORT = 587
+EMAIL_HOST_USER = 'AKIAIPRWQKYV6N5SMLUA'
+EMAIL_HOST_PASSWORD = 'ApK1dtH2qpT/oMl9MEauFvyN9XZDQ1fjzd8TumIs71NG'
+EMAIL_USE_SSL = False
+EMAIL_USE_TLS = True
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+EMAIL_DEFAULT_SENDER = 'rms.noreply@oneberrysystem.com'
 
 
 [LOCAL]
@@ -60,6 +84,14 @@ USER_DEFAULT_PASSWORD = password
 CATCH_EMAIL = gladys@tirsolutions.com
 CR_LINK = http://localhost:8000/cms/change-request/form/view
 REALTIMESERVER_IP = 127.0.0.1:8000
+EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
+EMAIL_PORT = 587
+EMAIL_HOST_USER = 'AKIAIPRWQKYV6N5SMLUA'
+EMAIL_HOST_PASSWORD = 'ApK1dtH2qpT/oMl9MEauFvyN9XZDQ1fjzd8TumIs71NG'
+EMAIL_USE_SSL = False
+EMAIL_USE_TLS = True
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+EMAIL_DEFAULT_SENDER = 'rms.noreply@oneberrysystem.com'
 
 [SETTINGS]
 CONFIG = config.settings.local