Merge pull request #586 in RMS/api-main-service from RMSv2 to SIT

* commit '2c2a7da7':
  fixing
  set debbuging to True just to make the enviroment of jtc then fix the issue later

config/settings/dev.py

@@ -14,7 +14,8 @@ CHANNEL_LAYERS = {
     'default': {
         'BACKEND': 'channels_redis.core.RedisChannelLayer',
         'CONFIG': {
-            "hosts": [('172.17.0.1', 6379)],
+            # "hosts": [('172.17.0.1', 6379)],
+            "hosts": [('127.0.0.1', 6379)],
         },
     },
 }

config/settings/local.py

@@ -11,6 +11,7 @@ CHANNEL_LAYERS = {
     'default': {
         'BACKEND': 'channels_redis.core.RedisChannelLayer',
         'CONFIG': {
+            # "hosts": [('127.0.0.1', 6379)],
             "hosts": [('127.0.0.1', 6379)],
         },
     },

config/settings/production.py

-from .base import *
-import configparser
-
-DEBUG = False
-
-ALLOWED_HOSTS = ['*']
-CORS_ORIGIN_ALLOW_ALL = True
-
-config = configparser.ConfigParser()
-config_file = os.path.join('./', 'env.ini')
-config.read(config_file)
-
-CHANNEL_LAYERS = {
-    'default': {
-        'BACKEND': 'channels_redis.core.RedisChannelLayer',
-        'CONFIG': {
-            "hosts": [('172.17.0.1', 6379)],
-        },
-    },
-}
-
-DATABASES = {
-    'default': {
-        'ENGINE': config['PRODUCTION']['DATABASE_ENGINE'],
-        'NAME': config['PRODUCTION']['DATABASE_NAME'],
-        'USER': config['PRODUCTION']['DATABASE_USER'],
-        'PASSWORD': config['PRODUCTION']['DATABASE_PASSWORD'],
-        'HOST': config['PRODUCTION']['DATABASE_HOST'],
-        'PORT': config['PRODUCTION']['DATABASE_PORT'],
-    }
-}
-
-# ****************
-# PROGRAM SETTINGS
-# ****************
-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['PRODUCTION']['REALTIMESERVER_IP']
-
-# Notification Messages
-APPROVER_MESSAGE = config['NOTIFICATION_EMAIL']['APPROVER_MESSAGE']
-REQUESTOR_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_MESSAGE']
-REQUESTOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_REJECT_MESSAGE']
-VENDOR_ACKNOWLEDGE_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_ACKNOWLEDGE_MESSAGE']
-REQUESTOR_ACKNOWLEDGE_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_ACKNOWLEDGE_MESSAGE']
-REQUESTOR_COMPLETION_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_COMPLETION_MESSAGE']
-VENDOR_ACCEPTANCE_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_ACCEPTANCE_MESSAGE']
-VENDOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_REJECT_MESSAGE']
-REVISED_MESSAGE = config['NOTIFICATION_EMAIL']['REVISED_MESSAGE']
-CANCEL_MESSAGE = config['NOTIFICATION_EMAIL']['CANCEL_MESSAGE']
-APPROVER_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['APPROVER_REJECT_MESSAGE']
-
-#ADMIN PROFILE
-CATCH_EMAIL = config['PRODUCTION']['CATCH_EMAIL']
-
-CR_FRONT_LINK = config['PRODUCTION']['CR_LINK']
-CORS_ORIGIN_ALLOW_ALL = False

config/settings/sit.py

 from .base import *
 import configparser
 
-DEBUG = False
+DEBUG = True
 
 ALLOWED_HOSTS = ['*']
 
@@ -13,7 +13,8 @@ CHANNEL_LAYERS = {
     'default': {
         'BACKEND': 'channels_redis.core.RedisChannelLayer',
         'CONFIG': {
-            "hosts": [('172.17.0.1', 6379)],
+            # "hosts": [('172.17.0.1', 6379)],
+            "hosts": [('127.0.0.1', 6379)],
         },
     },
 }

config/settings/staging.py

 from .base import *
 import configparser
 
-DEBUG = False
+DEBUG = True
 
 ALLOWED_HOSTS = ['*']
 
@@ -13,7 +13,8 @@ CHANNEL_LAYERS = {
     'default': {
         'BACKEND': 'channels_redis.core.RedisChannelLayer',
         'CONFIG': {
-            "hosts": [('172.17.0.1', 6379)],
+            # "hosts": [('172.17.0.1', 6379)],
+            "hosts": [('127.0.0.1', 6379)],
         },
     },
 }

config/settings/uat.py

-from .base import *
-import configparser
-
-DEBUG = True
-
-ALLOWED_HOSTS = ['*']
-
-config = configparser.ConfigParser()
-config_file = os.path.join('./', 'env.ini')
-config.read(config_file)
-
-CHANNEL_LAYERS = {
-    'default': {
-        'BACKEND': 'channels_redis.core.RedisChannelLayer',
-        'CONFIG': {
-            "hosts": [('172.17.0.1', 6379)],
-        },
-    },
-}
-
-DATABASES = {
-    'default': {
-        'ENGINE': config['UAT']['DATABASE_ENGINE'],
-        'NAME': config['UAT']['DATABASE_NAME'],
-        'USER': config['UAT']['DATABASE_USER'],
-        'PASSWORD': config['UAT']['DATABASE_PASSWORD'],
-        'HOST': config['UAT']['DATABASE_HOST'],
-        'PORT': config['UAT']['DATABASE_PORT'],
-    }
-}
-
-# ****************
-# PROGRAM SETTINGS
-# ****************
-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['UAT']['REALTIMESERVER_IP']
-
-
-# Notification Messages
-APPROVER_MESSAGE = config['NOTIFICATION_EMAIL']['APPROVER_MESSAGE']
-REQUESTOR_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_MESSAGE']
-REQUESTOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_REJECT_MESSAGE']
-VENDOR_ACKNOWLEDGE_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_ACKNOWLEDGE_MESSAGE']
-REQUESTOR_ACKNOWLEDGE_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_ACKNOWLEDGE_MESSAGE']
-REQUESTOR_COMPLETION_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_COMPLETION_MESSAGE']
-VENDOR_ACCEPTANCE_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_ACCEPTANCE_MESSAGE']
-VENDOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_REJECT_MESSAGE']
-REVISED_MESSAGE = config['NOTIFICATION_EMAIL']['REVISED_MESSAGE']
-CANCEL_MESSAGE = config['NOTIFICATION_EMAIL']['CANCEL_MESSAGE']
-APPROVER_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['APPROVER_REJECT_MESSAGE']
-
-#ADMIN PROFILE
-CATCH_EMAIL = config['UAT']['CATCH_EMAIL']
-
-CR_FRONT_LINK = config['UAT']['CR_LINK']

env.template.ini

-[PRODUCTION]
+[DEMO]
 DATABASE_ENGINE = django.db.backends.mysql
 DATABASE_NAME = 
 DATABASE_USER = 
@@ -13,20 +13,6 @@ CATCH_EMAIL = gladys@tirsolutions.com
 CR_LINK = http://staging.rms.oneberrysystem.com/cms/change-request/form/view
 REALTIMESERVER_IP = 127.0.0.1:8000
 
-[UAT]
-DATABASE_ENGINE = django.db.backends.mysql
-DATABASE_NAME = 
-DATABASE_USER = 
-DATABASE_PASSWORD = 
-DATABASE_HOST = 
-DATABASE_PORT = 
-SESSION_TIMEOUT = 
-FRONT_END_URL = http://staging.rms.oneberrysystem.com
-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 = 127.0.0.1:8000
 
 [DEV]
 DATABASE_ENGINE = django.db.backends.mysql