diff --git a/.env.default b/.env.default index c2aac75..a12c047 100644 --- a/.env.default +++ b/.env.default @@ -18,25 +18,24 @@ OSIT_WEB_HTTPS_PORT=4443 OSIT_WEB_MAX_BODY_SIZE=5120M # For now this extra host variable is important for the AE Flask app to connect to the AE FastAPI API. -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 +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_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 # 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 +DOCKER_AE_API_SERVER_NAME=example-api.oneskyit.com +DOCKER_AE_API_V5_SERVER_NAME=example-api-v5.oneskyit.com +DOCKER_AE_APP_SERVER_NAME=example-app.oneskyit.com +DOCKER_PHPMYADMIN_SERVER_NAME=example-phpmyadmin.oneskyit.com +DOCKER_OSIT_SERVER_NAME=example.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,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 +# 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,example.localhost,example.oneskyit.com,example-app.oneskyit.com,example-connect.oneskyit.com,*.example-connect.oneskyit.com,example-demo.oneskyit.com,*.example-demo.oneskyit.com # Aether general shared config options @@ -44,12 +43,12 @@ OSIT_NGINX_SERVER_NAMES=flask_gunicorn.localhost,demo.localhost,test.localhost,t # home development, live testing, live production, onsite development, onsite testing, onsite production??? AE_CFG_ID=0 -AE_SERVER=test.oneskyit.com +AE_SERVER=example.oneskyit.com ## Aether API access and use AE_API_PROTOCOL=https -AE_API_SERVER=test-api.oneskyit.com -AE_API_SERVER_INTERNAL=test-api.oneskyit.com +AE_API_SERVER=example-api.oneskyit.com +AE_API_SERVER_INTERNAL=example-api.oneskyit.com AE_API_PORT=443 AE_API_PATH= AE_API_SECRET_KEY=the-secret-api-key @@ -93,6 +92,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_V5_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) @@ -111,8 +111,6 @@ AE_APP_UX_MODE=default # AE_APP_UX_MODE=native 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) diff --git a/aether_api_v5_fastapi_gunicorn.Dockerfile b/aether_api_v5_fastapi_gunicorn.Dockerfile index 55c713e..6829534 100644 --- a/aether_api_v5_fastapi_gunicorn.Dockerfile +++ b/aether_api_v5_fastapi_gunicorn.Dockerfile @@ -1,5 +1,5 @@ # FROM tiangolo/uvicorn-gunicorn-fastapi:latest -FROM tiangolo/uvicorn-gunicorn-fastapi:python3.10 +FROM tiangolo/uvicorn-gunicorn-fastapi:python3.11 LABEL maintainer="Scott Idem " diff --git a/aether_fastapi_gunicorn.Dockerfile b/aether_fastapi_gunicorn.Dockerfile index 72b6f8b..4b0546c 100644 --- a/aether_fastapi_gunicorn.Dockerfile +++ b/aether_fastapi_gunicorn.Dockerfile @@ -5,25 +5,15 @@ LABEL maintainer="Scott Idem " WORKDIR /srv/aether_api -# RUN apt install poppler-utils -RUN apt-get update; \ - apt-get install -y \ - poppler-utils \ - ; \ - rm -rf /var/lib/apt/lists/*; - -# RUN set -ex; \ -# \ -# apt-get update; \ -# apt-get install -y --no-install-recommends \ +# RUN apt-get update; \ +# apt-get install -y \ # poppler-utils \ # ; \ # rm -rf /var/lib/apt/lists/*; -RUN pdftoppm -h +# RUN pdftoppm -h COPY conf/aether_fastapi_requirements.txt /tmp/requirements.txt - RUN pip install --no-cache-dir -r /tmp/requirements.txt RUN pip freeze > /aether_fastapi_requirements_current.txt diff --git a/aether_flask_gunicorn.Dockerfile b/aether_flask_gunicorn.Dockerfile index e5633fc..ab5b91d 100644 --- a/aether_flask_gunicorn.Dockerfile +++ b/aether_flask_gunicorn.Dockerfile @@ -1,3 +1,4 @@ +# FROM python:latest FROM python:3.11 LABEL maintainer="Scott Idem " diff --git a/conf/nginx/site-enabled_aether_fastapi_gunicorn.conf b/conf/nginx/site-enabled_aether_fastapi_gunicorn.conf index 603873f..d70f3a7 100644 --- a/conf/nginx/site-enabled_aether_fastapi_gunicorn.conf +++ b/conf/nginx/site-enabled_aether_fastapi_gunicorn.conf @@ -6,7 +6,6 @@ server { ${DOCKER_AE_API_SERVER_NAME} fastapi.localhost api.localhost - # sr-api.oneskyit.com ; # server_name @@ -77,7 +76,6 @@ server { ${DOCKER_AE_API_SERVER_NAME} fastapi.localhost api.localhost - # sr-api.oneskyit.com ; # server_name