From 4d504182388c28387163fdb48f72ce97a9c1dcda Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Wed, 14 Feb 2024 20:27:17 -0500 Subject: [PATCH] Making things easier to configure --- .env.default | 1 + README.md | 11 +++++++++++ conf/nginx/site-enabled_aether_flask_gunicorn.conf | 14 ++++++++++++++ docker-compose.yml | 1 + 4 files changed, 27 insertions(+) diff --git a/.env.default b/.env.default index 1c78440..3ac884a 100644 --- a/.env.default +++ b/.env.default @@ -21,6 +21,7 @@ OSIT_WEB_MAX_BODY_SIZE=5120M DOCKER_AE_SERVER_EXTRA_HOST=example.oneskyit.com:192.168.32.20 DOCKER_AE_APP_SERVER_EXTRA_HOST=example-app.oneskyit.com:192.168.32.20 DOCKER_AE_API_SERVER_EXTRA_HOST=example-api.oneskyit.com:192.168.32.20 +DOCKER_AE_API_BAK_SERVER_EXTRA_HOST=example-bak-api.oneskyit.com:192.168.32.20 DOCKER_AE_API_V5_SERVER_EXTRA_HOST=example-api-v5.oneskyit.com:192.168.32.20 DOCKER_AE_APP_EXTRA_HOST=example-api.oneskyit.com:192.168.32.20 # This should be a static(ish) IP. It may need to be externally routable? prod-api.oneskyit.com:104.237.143.4 DOCKER_AE_APP_EXTRA_HOST_V5=example-api-v5.oneskyit.com:192.168.32.20 diff --git a/README.md b/README.md index 1f5b472..2ce726d 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,12 @@ sudo mkdir /srv/env sudo chown -R scott:scott /srv/env/ git clone https://scott_idem@bitbucket.org/oneskyit/one-sky-it-container-environment.git /srv/env/test_aether ``` +* Using rsync is also an option. The symlinked directories will need to be copied separately. +```bash +sudo rsync -vhr -progress /srv/env/prod_aether/ /srv/env/bak_aether +rsync -av /srv/http/aether_app/ /srv/apps/prod_aether_app_flask +rsync -av /srv/http/aether_api/ /srv/apps/prod_aether_api_fastapi +``` ### Part 2 * Create links to needed for the srv/ directories. See the README.md file under srv/ for details. @@ -115,6 +121,11 @@ sdfasdfasd git clone https://scott_idem@bitbucket.org/oneskyit/one-sky-it-contai ```bash +sudo ln -s /srv/apps/prod_aether_app_flask /srv/env/bak_aether/srv/aether_app_ln +sudo ln -s /srv/apps/prod_aether_api_fastapi /srv/env/bak_aether/srv/aether_api_ln +sudo ln -s /mnt/data/speaker_ready/hosted_tmp /srv/env/bak_aether/srv/hosted_tmp_ln +sudo ln -s /mnt/data/speaker_ready/hosted_files /srv/env/bak_aether/srv/hosted_files_ln + ln -s /srv/http/dev_app.oneskyit.com /srv/env/test_aether/srv/aether_app_ln ln -s /srv/http/dev_fastapi.oneskyit.com /srv/env/test_aether/srv/aether_api_ln ln -s /mnt/data/speaker_ready/hosted_tmp /srv/env/test_aether/srv/hosted_tmp_ln diff --git a/conf/nginx/site-enabled_aether_flask_gunicorn.conf b/conf/nginx/site-enabled_aether_flask_gunicorn.conf index 17d41ca..b0d0b7c 100644 --- a/conf/nginx/site-enabled_aether_flask_gunicorn.conf +++ b/conf/nginx/site-enabled_aether_flask_gunicorn.conf @@ -9,6 +9,13 @@ server { ${DOCKER_AE_APP_SERVER_NAME} flask_gunicorn.localhost demo.localhost dev.localhost + bak-app.oneskyit.com + bak-connect.oneskyit.com *.bak-connect.oneskyit.com + bak-demo.oneskyit.com *.bak-demo.oneskyit.com + + bak-businessgroup.oneskyit.com *.bak-businessgroup.oneskyit.com + bak-ishlt.oneskyit.com *.bak-ishlt.oneskyit.com + dev-app.oneskyit.com dev-connect.oneskyit.com *.dev-connect.oneskyit.com dev-demo.oneskyit.com *.dev-demo.oneskyit.com @@ -79,6 +86,13 @@ server { ${DOCKER_AE_APP_SERVER_NAME} flask_gunicorn.localhost demo.localhost dev.localhost + bak-app.oneskyit.com + bak-connect.oneskyit.com *.bak-connect.oneskyit.com + bak-demo.oneskyit.com *.bak-demo.oneskyit.com + + bak-businessgroup.oneskyit.com *.bak-businessgroup.oneskyit.com + bak-ishlt.oneskyit.com *.bak-ishlt.oneskyit.com + dev-app.oneskyit.com dev-connect.oneskyit.com *.dev-connect.oneskyit.com dev-demo.oneskyit.com *.dev-demo.oneskyit.com diff --git a/docker-compose.yml b/docker-compose.yml index f0e315d..4fd6659 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -333,6 +333,7 @@ services: extra_hosts: # - dev-api.oneskyit.com:192.168.32.20 - "${DOCKER_AE_API_SERVER_EXTRA_HOST}" + - "${DOCKER_AE_API_BAK_SERVER_EXTRA_HOST}" - "${DOCKER_AE_API_V5_SERVER_EXTRA_HOST}" volumes: - ./conf/aether_flask_gunicorn_conf.py:/conf/gunicorn_flask_conf.py