From 9fe60c418d28ff384062cb8409266bd673af4629 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Tue, 13 Feb 2024 17:42:20 -0500 Subject: [PATCH] Updated the cert filenames and paths --- .../site-enabled_aether_fastapi_gunicorn.conf | 20 ++++++++-------- .../site-enabled_aether_flask_gunicorn.conf | 10 ++++---- docker-compose.yml | 24 ++++++++++--------- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/conf/nginx/site-enabled_aether_fastapi_gunicorn.conf b/conf/nginx/site-enabled_aether_fastapi_gunicorn.conf index d70f3a7..fd71109 100644 --- a/conf/nginx/site-enabled_aether_fastapi_gunicorn.conf +++ b/conf/nginx/site-enabled_aether_fastapi_gunicorn.conf @@ -1,7 +1,7 @@ server { listen 80; listen [::]:80; - + server_name ${DOCKER_AE_API_SERVER_NAME} fastapi.localhost @@ -36,13 +36,13 @@ server { fastcgi_connect_timeout 4s; fastcgi_send_timeout 5s; fastcgi_read_timeout 5s; - + # proxy read timeout being too low will cause 504 Gateway Time-out on the client browser proxy_read_timeout 2100s; proxy_pass http://fastapi_backend; } - + location /ws { proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; @@ -61,7 +61,7 @@ server { # proxy_headers_hash_max_size 1024; proxy_pass http://fastapi_backend; - + access_log /logs/nginx/access_fastapi_gunicorn_ws.log; error_log /logs/nginx/error_fastapi_gunicorn_ws.log; } @@ -71,7 +71,7 @@ server { server { listen 443 ssl; listen [::]:443 ssl; - + server_name ${DOCKER_AE_API_SERVER_NAME} fastapi.localhost @@ -90,8 +90,8 @@ server { include /etc/nginx/options-ssl-nginx.conf; - ssl_certificate /etc/certs/fullchain.pem; - ssl_certificate_key /etc/certs/privkey.pem; + ssl_certificate /etc/certs/fullchain_wild.pem; + ssl_certificate_key /etc/certs/privkey_wild.pem; ssl_dhparam /etc/certs/ssl-dhparams.pem; # include brotli.conf; @@ -115,13 +115,13 @@ server { fastcgi_connect_timeout 35s; fastcgi_send_timeout 35s; fastcgi_read_timeout 35s; - + # proxy read timeout being too low will cause 504 Gateway Time-out on the client browser proxy_read_timeout 2100s; proxy_pass http://fastapi_backend; } - + location /ws { proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; @@ -140,7 +140,7 @@ server { # proxy_headers_hash_max_size 1024; proxy_pass http://fastapi_backend; - + access_log /logs/nginx/access_fastapi_gunicorn_ws.log; error_log /logs/nginx/error_fastapi_gunicorn_ws.log; } diff --git a/conf/nginx/site-enabled_aether_flask_gunicorn.conf b/conf/nginx/site-enabled_aether_flask_gunicorn.conf index 4f45ff8..859a67a 100644 --- a/conf/nginx/site-enabled_aether_flask_gunicorn.conf +++ b/conf/nginx/site-enabled_aether_flask_gunicorn.conf @@ -1,14 +1,14 @@ server { listen 80; listen [::]:80; - + # server_name # ${NGINX_SERVER_NAMES} # ; 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 @@ -70,7 +70,7 @@ server { server { listen 443 ssl; listen [::]:443 ssl; - + # The Docker nginx envsubst with templates does not work for multiple server names. # server_name # ${NGINX_SERVER_NAMES} @@ -116,8 +116,8 @@ server { include /etc/nginx/options-ssl-nginx.conf; - ssl_certificate /etc/certs/fullchain.pem; - ssl_certificate_key /etc/certs/privkey.pem; + ssl_certificate /etc/certs/fullchain_wild.pem; + ssl_certificate_key /etc/certs/privkey_wild.pem; ssl_dhparam /etc/certs/ssl-dhparams.pem; # include brotli.conf; diff --git a/docker-compose.yml b/docker-compose.yml index fb210e9..38aaf6e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,7 +46,7 @@ services: # - ./conf/nginx/other.conf:/etc/nginx/conf.d/other.conf - ./conf/nginx/site.conf:/etc/nginx/conf.d/0_site.conf - + # - ./conf/nginx/site-enabled_aether-mailman2.conf:/etc/nginx/conf.d/site-enabled_aether-mailman2.conf # - ./conf/nginx/site-enabled_aether-nextcloud.conf:/etc/nginx/conf.d/site-enabled_aether-nextcloud.conf # - ./conf/nginx/site-enabled_aether-phpmyadmin.conf:/etc/nginx/templates/site-enabled_aether-phpmyadmin.conf.template @@ -58,6 +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/oneskyit_wild_fullchain.pem:/etc/certs/fullchain_wild.pem + - ./conf/certs/oneskyit_wild_privkey.pem:/etc/certs/privkey_wild.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 @@ -251,11 +253,11 @@ services: - ./conf/aether_fastapi_gunicorn_conf.py:/conf/gunicorn_fastapi_conf.py - ./conf/aether_fastapi_requirements_current.txt:/requirements_current.txt - ./conf/aether_api_config.py:/srv/aether_api/app/config.py - + - ./logs/ae_api:/logs # - ./logs/ae_api/aether_fastapi_gunicorn.log:/logs/gunicorn.log # - ./logs/aether_fastapi_gunicorn_access.log:/logs/gunicorn_access.log - # - ./logs/aether_fastapi_gunicorn_error.log:/logs/gunicorn_error.log + # - ./logs/aether_fastapi_gunicorn_error.log:/logs/gunicorn_error.log # - ./logs/aether_api.log:/logs/aether_api.log # - ./logs/ae_api/aether_api.log.1:/logs/aether_api.log.1 # - ./logs/ae_api/aether_api.log.2:/logs/aether_api.log.2 @@ -263,13 +265,13 @@ services: # - ./logs/ae_api/aether_api.log.4:/logs/aether_api.log.4 # - ./logs/ae_api/aether_api.log.5:/logs/aether_api.log.5 # - ./logs/ae_api/aether_api_warning.log:/logs/aether_api_warning.log - + - ./srv/aether_api_ln:/srv/aether_api - ./srv/hosted_files_ln:/srv/hosted_files - ./srv/hosted_tmp_ln:/srv/hosted_tmp - + # - ./tmp/ae_api:/tmp - + - ./temp/ae_api:/temp # - ./temp/ae_api/aether_fastapi_requirements_current.txt:/temp/requirements_current.txt # links: @@ -278,7 +280,7 @@ services: - redis stdin_open: true # docker run -i tty: true # docker run -t - + # aether_api_v5_gunicorn: # restart: always # container_name: ae_api_v5_dev @@ -294,15 +296,15 @@ services: # - ./conf/aether_api_v5_fastapi_gunicorn_conf.py:/conf/gunicorn_fastapi_conf.py # - ./conf/aether_api_v5_fastapi_requirements_current.txt:/conf/requirements_current.txt # - ./conf/aether_api_v5_fastapi_config.py:/srv/aether_api/app/config.py -# +# # - ./logs/ae_api_v5:/logs -# +# # - ./srv/aether_api_v5_ln:/srv/aether_api # - ./srv/hosted_files_ln:/srv/hosted_files # - ./srv/hosted_tmp_ln:/srv/hosted_tmp -# +# # # - ./tmp/ae_api:/tmp -# +# # - ./temp/ae_api:/temp # # - ./temp/ae_api/aether_fastapi_requirements_current.txt:/temp/requirements_current.txt # # links: