From 5b65bd5a1f6550bc09abe67d51ea5697e9a05a42 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Tue, 13 Jun 2023 16:09:42 -0400 Subject: [PATCH] More clean up of Docker config related files --- .env.default | 20 +++++++++++++++++--- docker-compose.yml | 4 ++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.env.default b/.env.default index e1932c5..f71a052 100644 --- a/.env.default +++ b/.env.default @@ -8,19 +8,25 @@ OSIT_WEB_HTTP_PORT=8080 OSIT_WEB_HTTPS_PORT=4443 # For now this extra host variable is important for the AE Flask app to connect to the AE FastAPI API. -DOCKER_AE_APP_EXTRA_HOST=dev-api.oneskyit.com:192.168.32.20 +DOCKER_AE_SERVER_EXTRA_HOST=test.oneskyit.com:192.168.32.20 +DOCKER_AE_APP_SERVER_EXTRA_HOST=test-app.oneskyit.com:192.168.32.20 +DOCKER_AE_API_SERVER_EXTRA_HOST=test-api.oneskyit.com:192.168.32.20 +DOCKER_AE_API_V5_SERVER_EXTRA_HOST=test-api-v5.oneskyit.com:192.168.32.20 +DOCKER_AE_APP_EXTRA_HOST=test-api.oneskyit.com:192.168.32.20 +DOCKER_AE_APP_EXTRA_HOST_V5=test-api-v5.oneskyit.com:192.168.32.20 # DOCKER_AE_APP_EXTRA_HOST=default-api.oneskyit.com:104.237.143.4 # This is the server name for nginx for each of these sites. # Only one server name per server_name in nginx with envsubst!!! A bug??? DOCKER_AE_API_SERVER_NAME=default-api.oneskyit.com +DOCKER_AE_API_V5_SERVER_NAME=default-api-v5.oneskyit.com # DOCKER_AE_APP_SERVER_NAME=default-app.oneskyit.com DOCKER_PHPMYADMIN_SERVER_NAME=default-phpmyadmin.oneskyit.com DOCKER_OSIT_SERVER_NAME=default.oneskyit.com # This needs to be updated for each client's subdomain. # This is not currently working with the nginx Docker Compose. It uses envsubst with a template conf file. -OSIT_NGINX_SERVER_NAMES=flask_gunicorn.localhost,demo.localhost,dev.localhost,dev.oneskyit.com,dev-app.oneskyit.com,dev-connect.oneskyit.com,*.dev-connect.oneskyit.com,dev-demo.oneskyit.com,*.dev-demo.oneskyit.com,test-app.oneskyit.com,default-app.oneskyit.com +OSIT_NGINX_SERVER_NAMES=flask_gunicorn.localhost,demo.localhost,test.localhost,test.oneskyit.com,test-app.oneskyit.com,test-connect.oneskyit.com,*.test-connect.oneskyit.com,test-demo.oneskyit.com,*.test-demo.oneskyit.com,test-app.oneskyit.com,default-app.oneskyit.com # Aether general shared config options @@ -28,9 +34,11 @@ OSIT_NGINX_SERVER_NAMES=flask_gunicorn.localhost,demo.localhost,dev.localhost,de # home development, live testing, live production, onsite development, onsite testing, onsite production??? AE_CFG_ID=0 +AE_SERVER=test.oneskyit.com + ## Aether API access and use AE_API_PROTOCOL=https -AE_API_SERVER=dev-api.oneskyit.com +AE_API_SERVER=test-api.oneskyit.com AE_API_SERVER_INTERNAL=test-api.oneskyit.com AE_API_PORT=443 AE_API_PATH= @@ -43,6 +51,12 @@ AE_DB_NAME=aether_dev AE_DB_USERNAME=osit_aether AE_DB_PASSWORD="the password with $$ escape" +AE_DB_V5_SERVER=linode.oneskyit.com +AE_DB_V5_PORT=3306 +AE_DB_V5_NAME=aether_v5_dev +AE_DB_V5_USERNAME=ae_v5 +AE_DB_V5_PASSWORD="" + ## Aether Redis access and use AE_REDIS_SERVER=redis AE_REDIS_PORT=6379 diff --git a/docker-compose.yml b/docker-compose.yml index ab6800c..13696e5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -330,8 +330,8 @@ services: # - local-net extra_hosts: # - dev-api.oneskyit.com:192.168.32.20 - - "${DOCKER_AE_APP_EXTRA_HOST}" - - "${DOCKER_AE_APP_EXTRA_HOST_V5}" + - "${DOCKER_AE_API_SERVER_EXTRA_HOST}" + - "${DOCKER_AE_API_V5_SERVER_EXTRA_HOST}" volumes: - ./conf/aether_flask_gunicorn_conf.py:/conf/gunicorn_flask_conf.py - ./conf/aether_app_config.py:/srv/aether_app/flask_config_v2.py