revert all changes on email configurations

config/settings/base.py

@@ -159,6 +159,7 @@ REST_FRAMEWORK = {
     'PAGE_SIZE': 10
 }
 
+<<<<<<< HEAD
 # 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
@@ -168,6 +169,20 @@ REST_FRAMEWORK = {
 # 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_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")
+
+>>>>>>> 4ce8c93... revert all changes on email configurations
 
 EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
 

config/settings/demo.py

@@ -31,6 +31,7 @@ DATABASES = {
     }
 }
 
+<<<<<<< HEAD
 ################
 # EMAIL SETTINGS
 ################
@@ -44,6 +45,8 @@ EMAIL_USE_TLS = config['DEMO']['EMAIL_USE_TLS']
 EMAIL_BACKEND = config['DEMO']['EMAIL_BACKEND']
 EMAIL_DEFAULT_SENDER = config['DEMO']['EMAIL_DEFAULT_SENDER']
 
+=======
+>>>>>>> 4ce8c93... revert all changes on email configurations
 # ****************
 # PROGRAM SETTINGS
 # ****************

config/settings/dev.py

@@ -31,6 +31,7 @@ DATABASES = {
     }
 }
 
+<<<<<<< HEAD
 ################
 # EMAIL SETTINGS
 ################
@@ -45,6 +46,8 @@ EMAIL_BACKEND = config['DEV']['EMAIL_BACKEND']
 EMAIL_DEFAULT_SENDER = config['DEV']['EMAIL_DEFAULT_SENDER']
 
 
+=======
+>>>>>>> 4ce8c93... revert all changes on email configurations
 # ****************
 # PROGRAM SETTINGS
 # ****************

config/settings/local.py

@@ -28,6 +28,7 @@ DATABASES = {
     }
 }
 
+<<<<<<< HEAD
 ################
 # EMAIL SETTINGS
 ################
@@ -42,6 +43,8 @@ EMAIL_BACKEND = config['LOCAL']['EMAIL_BACKEND']
 EMAIL_DEFAULT_SENDER = config['LOCAL']['EMAIL_DEFAULT_SENDER']
 
 
+=======
+>>>>>>> 4ce8c93... revert all changes on email configurations
 # ****************
 # PROGRAM SETTINGS
 # ****************

config/settings/sit.py

@@ -30,6 +30,7 @@ DATABASES = {
     }
 }
 
+<<<<<<< HEAD
 ################
 # EMAIL SETTINGS
 ################
@@ -43,6 +44,8 @@ EMAIL_USE_TLS = config['SIT']['EMAIL_USE_TLS']
 EMAIL_BACKEND = config['SIT']['EMAIL_BACKEND']
 EMAIL_DEFAULT_SENDER = config['SIT']['EMAIL_DEFAULT_SENDER']
 
+=======
+>>>>>>> 4ce8c93... revert all changes on email configurations
 # ****************
 # PROGRAM SETTINGS
 # ****************

env.template.ini

@@ -12,14 +12,6 @@ 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_PORT = 587
-EMAIL_HOST_USER = 
-EMAIL_HOST_PASSWORD =
-EMAIL_USE_SSL = False
-EMAIL_USE_TLS = True
-EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_DEFAULT_SENDER = 'rms.noreply@oneberrysystem.com'
 
 
 [DEV]
@@ -36,14 +28,6 @@ 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_PORT = 587
-EMAIL_HOST_USER = 
-EMAIL_HOST_PASSWORD =
-EMAIL_USE_SSL = False
-EMAIL_USE_TLS = True
-EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_DEFAULT_SENDER = 'rms.noreply@oneberrysystem.com'
 
 
 [STAGING]
@@ -60,14 +44,6 @@ 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_PORT = 587
-EMAIL_HOST_USER = 
-EMAIL_HOST_PASSWORD =
-EMAIL_USE_SSL = False
-EMAIL_USE_TLS = True
-EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_DEFAULT_SENDER = 'rms.noreply@oneberrysystem.com'
 
 
 [LOCAL]
@@ -84,14 +60,6 @@ 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_PORT = 587
-EMAIL_HOST_USER = 
-EMAIL_HOST_PASSWORD =
-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