From 8bf5b4955214ae85fe2726d096f4fa9273e402e1 Mon Sep 17 00:00:00 2001
From: Scott Idem <stidem@gmail.com>
Date: Fri, 8 Sep 2023 15:24:48 -0400
Subject: [PATCH] Now with more .env vars!

---
 .env.default       | 2 ++
 docker-compose.yml | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.env.default b/.env.default
index 1843803..c2aac75 100644
--- a/.env.default
+++ b/.env.default
@@ -93,6 +93,7 @@ AE_SMTP_USERNAME=send_mail
 AE_API_ENV=development
 AE_API_DIR=/srv/aether_api
 AE_API_LOG_PATH="/logs/aether_api.log"
+AE_API_GUNICORN_PORT=5065
 AE_API_GUNICORN_TIMEOUT=2100 # (default=30; should be much higher)
 AE_API_GUNICORN_GRACEFUL_TIMEOUT=30 # (default=30)
 AE_API_GUNICORN_KEEPALIVE=30 # (default=2)
@@ -112,6 +113,7 @@ AE_APP_DIR=/srv/aether_app
 AE_APP_LOG_PATH="/logs/aether_app.log"
 AE_APP_WORKERS=2
 AE_APP_THREADS=1
+AE_APP_GUNICORN_PORT=5055
 AE_APP_GUNICORN_TIMEOUT=1200 # (default=30; should be higher)
 AE_APP_GUNICORN_GRACEFUL_TIMEOUT=20 # (default=30)
 AE_APP_GUNICORN_KEEPALIVE=30 # (default=2)
diff --git a/docker-compose.yml b/docker-compose.yml
index 6181b11..947e7cb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -230,7 +230,7 @@ services:
         ports:
             # host to image
             # default port is 6379
-            - "6389:6379"
+            - "${AE_REDIS_PORT}:6379"
 
     aether_api_gunicorn:
         restart: always
@@ -242,7 +242,7 @@ services:
         env_file:
             - ./.env
         ports:
-            - "5065:5005"
+            - "${AE_API_GUNICORN_PORT}:5005"
         # expose:
         #   - 5005
         # networks:
@@ -323,7 +323,7 @@ services:
         env_file:
             - ./.env
         ports:
-            - "5055:5005"
+            - "${AE_APP_GUNICORN_PORT}:5005"
         # expose:
         #   - 5005
         # networks: