Merge pull request #729 in RMS/api-main-service from core-dev-red-develop to RMSv2

* commit '04fcc72a':
  set email domain to rsm-hub.com

config/settings/base.py

@@ -159,26 +159,26 @@ REST_FRAMEWORK = {
     'PAGE_SIZE': 10
 }
 
-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 = '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'
-
 # EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
-
-
-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_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 = 'noreply@rms-hub.com'
+# EMAIL_DEFAULT_SENDER = 'rms.noreply@oneberrysystem.com'
+
+# EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
+
+
+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'