Merge pull request #157 in RMS/api-main-service from gladys-dev2 to RMSv2

* commit 'a455b40e':
  realtimeserver settings 1
  realtimeserver settings

config/settings/dev.py

@@ -27,7 +27,7 @@ SESSION_TIMEOUT = config['DEV']['SESSION_TIMEOUT']
 FRONT_END_URL = config['DEV']['FRONT_END_URL']
 AUTH_ACCESSS_TOKEN_TIMEOUT = config['DEV']['AUTH_ACCESSS_TOKEN_TIMEOUT']
 USER_DEFAULT_PASSWORD = config['DEV']['USER_DEFAULT_PASSWORD']
-REALTIMESERVER_IP = config['NOTIFICATION']['REALTIMESERVER_IP']
+REALTIMESERVER_IP = config['DEV']['REALTIMESERVER_IP']
 
 # Notification Messages
 APPROVER_MESSAGE = config['NOTIFICATION_EMAIL']['APPROVER_MESSAGE']

config/settings/local.py

@@ -25,7 +25,7 @@ SESSION_TIMEOUT = config['LOCAL']['SESSION_TIMEOUT']
 FRONT_END_URL = config['LOCAL']['FRONT_END_URL']
 AUTH_ACCESSS_TOKEN_TIMEOUT = config['LOCAL']['AUTH_ACCESSS_TOKEN_TIMEOUT']
 USER_DEFAULT_PASSWORD = config['LOCAL']['USER_DEFAULT_PASSWORD']
-REALTIMESERVER_IP = config['NOTIFICATION']['REALTIMESERVER_IP']
+REALTIMESERVER_IP = config['LOCAL']['REALTIMESERVER_IP']
 
 # Notification Messages
 APPROVER_MESSAGE = config['NOTIFICATION_EMAIL']['APPROVER_MESSAGE']

config/settings/production.py

@@ -27,7 +27,7 @@ SESSION_TIMEOUT = config['PRODUCTION']['SESSION_TIMEOUT']
 FRONT_END_URL = config['PRODUCTION']['FRONT_END_URL']
 AUTH_ACCESSS_TOKEN_TIMEOUT = config['PRODUCTION']['AUTH_ACCESSS_TOKEN_TIMEOUT']
 USER_DEFAULT_PASSWORD = config['PRODUCTION']['USER_DEFAULT_PASSWORD']
-REALTIMESERVER_IP = config['NOTIFICATION']['REALTIMESERVER_IP']
+REALTIMESERVER_IP = config['PRODUCTION']['REALTIMESERVER_IP']
 
 # Notification Messages
 APPROVER_MESSAGE = config['NOTIFICATION_EMAIL']['APPROVER_MESSAGE']

config/settings/uat.py

@@ -27,7 +27,7 @@ SESSION_TIMEOUT = config['UAT']['SESSION_TIMEOUT']
 FRONT_END_URL = config['UAT']['FRONT_END_URL']
 AUTH_ACCESSS_TOKEN_TIMEOUT = config['UAT']['AUTH_ACCESSS_TOKEN_TIMEOUT']
 USER_DEFAULT_PASSWORD = config['UAT']['USER_DEFAULT_PASSWORD']
-REALTIMESERVER_IP = config['NOTIFICATION']['REALTIMESERVER_IP']
+REALTIMESERVER_IP = config['UAT']['REALTIMESERVER_IP']
 
 
 # Notification Messages

env.template.ini

@@ -11,6 +11,7 @@ AUTH_ACCESSS_TOKEN_TIMEOUT =
 USER_DEFAULT_PASSWORD = 
 CATCH_EMAIL = gladys@tirsolutions.com
 CR_LINK = http://staging.rms.oneberrysystem.com/cms/change-request/form/view
+REALTIMESERVER_IP = 172.17.0.1:6379
 
 [UAT]
 DATABASE_ENGINE = django.db.backends.mysql
@@ -25,6 +26,7 @@ AUTH_ACCESSS_TOKEN_TIMEOUT =
 USER_DEFAULT_PASSWORD = 
 CATCH_EMAIL = gladys@tirsolutions.com
 CR_LINK = http://staging.rms.oneberrysystem.com/cms/change-request/form/view
+REALTIMESERVER_IP = 172.17.0.1:6379
 
 [DEV]
 DATABASE_ENGINE = django.db.backends.mysql
@@ -39,6 +41,7 @@ AUTH_ACCESSS_TOKEN_TIMEOUT =
 USER_DEFAULT_PASSWORD = 
 CATCH_EMAIL = gladys@tirsolutions.com
 CR_LINK = http://devweb.rms.oneberrysystem.com/cms/change-request/form/view
+REALTIMESERVER_IP = 172.17.0.1:6379
 
 [LOCAL]
 DATABASE_ENGINE = django.db.backends.mysql
@@ -53,9 +56,7 @@ AUTH_ACCESSS_TOKEN_TIMEOUT = 3600
 USER_DEFAULT_PASSWORD = password
 CATCH_EMAIL = gladys@tirsolutions.com
 CR_LINK = http://localhost:8000/cms/change-request/form/view
-
-[NOTIFICATION]
-REALTIMESERVER_IP = 172.17.0.1:6379
+REALTIMESERVER_IP = 127.0.0.1:8000
 
 [SETTINGS]
 CONFIG = config.settings.local