From 3a149255408e284f422d2d8fed9f43295dd8e13b Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Tue, 13 Feb 2024 16:32:38 -0500 Subject: [PATCH] General updates. Enabled CHOW. --- conf/nginx/site-enabled_aether_flask_gunicorn.conf | 12 +++++++----- docker-compose.yml | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/conf/nginx/site-enabled_aether_flask_gunicorn.conf b/conf/nginx/site-enabled_aether_flask_gunicorn.conf index 0542389..4f45ff8 100644 --- a/conf/nginx/site-enabled_aether_flask_gunicorn.conf +++ b/conf/nginx/site-enabled_aether_flask_gunicorn.conf @@ -12,10 +12,11 @@ server { dev-app.oneskyit.com dev-connect.oneskyit.com *.dev-connect.oneskyit.com dev-demo.oneskyit.com *.dev-demo.oneskyit.com - + dev-aacc.oneskyit.com *.dev-aacc.oneskyit.com dev-aapor.oneskyit.com *.dev-aapor.oneskyit.com dev-businessgroup.oneskyit.com *.dev-businessgroup.oneskyit.com + dev-chow.oneskyit.com *.dev-chow.oneskyit.com dev-cmsc.oneskyit.com *.dev-cmsc.oneskyit.com dev-idaa.oneskyit.com *.dev-idaa.oneskyit.com dev-ishlt.oneskyit.com *.dev-ishlt.oneskyit.com @@ -34,7 +35,7 @@ server { # sr-cmsc.oneskyit.com *.sr-cmsc.oneskyit.com # sr-lci.oneskyit.com *.sr-lci.oneskyit.com # sr-ncsd.oneskyit.com *.sr-ncsd.oneskyit.com - + test-app.oneskyit.com # test-idaa.oneskyit.com *.test-idaa.oneskyit.com # test-ishlt.oneskyit.com *.test-ishlt.oneskyit.com @@ -77,14 +78,15 @@ server { server_name ${DOCKER_AE_APP_SERVER_NAME} flask_gunicorn.localhost demo.localhost dev.localhost - + dev-app.oneskyit.com dev-connect.oneskyit.com *.dev-connect.oneskyit.com dev-demo.oneskyit.com *.dev-demo.oneskyit.com - + dev-aacc.oneskyit.com *.dev-aacc.oneskyit.com dev-aapor.oneskyit.com *.dev-aapor.oneskyit.com dev-businessgroup.oneskyit.com *.dev-businessgroup.oneskyit.com + dev-chow.oneskyit.com *.dev-chow.oneskyit.com dev-cmsc.oneskyit.com *.dev-cmsc.oneskyit.com dev-idaa.oneskyit.com *.dev-idaa.oneskyit.com dev-ishlt.oneskyit.com *.dev-ishlt.oneskyit.com @@ -103,7 +105,7 @@ server { # sr-cmsc.oneskyit.com *.sr-cmsc.oneskyit.com # sr-lci.oneskyit.com *.sr-lci.oneskyit.com # sr-ncsd.oneskyit.com *.sr-ncsd.oneskyit.com - + test-app.oneskyit.com # test-idaa.oneskyit.com *.test-idaa.oneskyit.com # test-ishlt.oneskyit.com *.test-ishlt.oneskyit.com diff --git a/docker-compose.yml b/docker-compose.yml index 550e5c1..fb210e9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: # - NGINX_SERVER_NAMES="dev-idaa.oneskyit.com dev-ishlt.oneskyit.com" # - AE_DOMAIN_LIST:'dev-aapor.oneskyit.com dev-businessgroup.oneskyt.com dev-cmsc.oneskyit.com dev-idaa.oneskyit.com dev-ishlt.oneskyit.com dev-ncsd.oneskyit.com dev-npa.oneskyit.com dev-rli.oneskyit.com' # - 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 dev-aapor.oneskyit.com *.dev-aapor.oneskyit.com dev-businessgroup.oneskyt.com *.dev-businessgroup.oneskyt.com dev-cmsc.oneskyit.com *.dev-cmsc.oneskyit.com dev-idaa.oneskyit.com *.dev-idaa.oneskyit.com dev-ishlt.oneskyit.com *.dev-ishlt.oneskyit.com dev-ncsd.oneskyit.com *.dev-ncsd.oneskyit.com dev-npa.oneskyit.com *.dev-npa.oneskyit.com dev-rli.oneskyit.com *.dev-rli.oneskyit.com test-app.oneskyit.com" - - NGINX_SERVER_NAMES="flask_gunicorn.localhost demo.localhost dev.localhost dev.oneskyit.com dev-app.oneskyit.com dev-connect.oneskyit.com dev-demo.oneskyit.com dev-aacc.oneskyit.com dev-aapor.oneskyit.com dev-businessgroup.oneskyt.com dev-cmsc.oneskyit.com dev-idaa.oneskyit.com dev-ishlt.oneskyit.com dev-lci.oneskyit.com dev-ncsd.oneskyit.com dev-npa.oneskyit.com dev-rli.oneskyit.com test-app.oneskyit.com" + - NGINX_SERVER_NAMES="flask_gunicorn.localhost demo.localhost dev.localhost dev.oneskyit.com dev-app.oneskyit.com dev-connect.oneskyit.com dev-demo.oneskyit.com dev-aacc.oneskyit.com dev-aapor.oneskyit.com dev-businessgroup.oneskyt.com dev-chow.oneskyit.com dev-cmsc.oneskyit.com dev-idaa.oneskyit.com dev-ishlt.oneskyit.com dev-lci.oneskyit.com dev-ncsd.oneskyit.com dev-npa.oneskyit.com dev-rli.oneskyit.com test-app.oneskyit.com" ports: - "${OSIT_WEB_HTTP_PORT}:80" - "${OSIT_WEB_HTTPS_PORT}:443" @@ -58,8 +58,8 @@ services: # - ./conf/nginx/site-enabled_aether_api_v5_fastapi_gunicorn.conf:/etc/nginx/templates/site-enabled_aether_api_v5_fastapi_gunicorn.conf.template - ./conf/nginx/site-enabled_aether_flask_gunicorn.conf:/etc/nginx/templates/site-enabled_aether_flask_gunicorn.conf.template - - ./conf/certs/fullchain.pem:/etc/certs/fullchain.pem - - ./conf/certs/privkey.pem:/etc/certs/privkey.pem + - ./conf/certs/oneskyit.com_fullchain.pem:/etc/certs/fullchain.pem + - ./conf/certs/oneskyit.com_privkey.pem:/etc/certs/privkey.pem - ./conf/certs/ssl-dhparams.pem:/etc/certs/ssl-dhparams.pem - ./logs/web:/logs