Merge pull request #205 from gcivil-nyu-org/develop

gcivil-nyu-org · Dec 11, 2023 · 8378c4b · 8378c4b
2 parents b608cdc + b3eb280
commit 8378c4b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -41,4 +41,13 @@ deploy:
     bucket: $BUCKET_NAME_UE1
     env: soloconnect-chat-integration
     on:
-      branch: develop
+      branch: develop
+  - provider: elasticbeanstalk
+    access_key_id: $ACCESS_KEY_ID
+    secret_access_key: $SECRET_ACCESS_KEY
+    region: $REGION_UE1
+    app: $APP_NAME
+    bucket: $BUCKET_NAME_UE1
+    env: soloconnect-chat-production
+    on:
+      branch: master
diff --git a/soloconnect/settings.py b/soloconnect/settings.py
@@ -30,11 +30,13 @@
     "localhost",
     "127.0.0.1",
     "172.31.31.138",
+    "172.31.35.113",
     "soloconnect-integration.us-east-1.elasticbeanstalk.com",
     "soloconnect-db-final.us-west-2.elasticbeanstalk.com",
     "soloconnect-production.us-east-1.elasticbeanstalk.com",
     "testserver",
     "soloconnect-chat-integration.us-east-1.elasticbeanstalk.com",
+    "soloconnect-chat-production.us-east-1.elasticbeanstalk.com",
 ]
 
 # Application definition
@@ -175,24 +177,24 @@
 EMAIL_HOST_PASSWORD = os.getenv("EMAIL_HOST_PASSWORD")
 EMAIL_PORT = 587
 
+REDIS_HOST = os.getenv("REDIS_HOST")
+REDIS_CACHE_LOCATION = os.getenv("REDIS_CACHE_LOCATION")
 
 CHANNEL_LAYERS = {
     "default": {
         "BACKEND": "channels_redis.core.RedisChannelLayer",
         "CONFIG": {
             "hosts": [
-                # todo Uncomment host and comment redis url if you want to run locally
-                # ("127.0.0.1", 6379)
                 (
-                    "sc-redis.45ncis.ng.0001.use1.cache.amazonaws.com",
+                    REDIS_HOST,
                     6379,
                 ),
             ],
         },
         "CACHES": {
             "default": {
                 "BACKEND": "django.core.cache.backends.redis.RedisCache",
-                "LOCATION": "redis://sc-redis.45ncis.ng.0001.use1.cache.amazonaws.com:6379/1",
+                "LOCATION": REDIS_CACHE_LOCATION,
             }
         },
     },