From 90ecc8206a24b7ad7e3d63f0172e9addad4d0aa7 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Fri, 29 Mar 2024 16:46:41 -0400 Subject: [PATCH] General clean up --- conf/nginx/site-enabled_aether-nextcloud.conf | 4 ++-- conf/nginx/site-enabled_aether-phpmyadmin.conf | 8 ++++---- ...e-enabled_aether_api_v5_fastapi_gunicorn.conf | 16 ++++++++-------- conf/nginx/site-enabled_oneskyit.conf | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/conf/nginx/site-enabled_aether-nextcloud.conf b/conf/nginx/site-enabled_aether-nextcloud.conf index 38be707..1e520a2 100644 --- a/conf/nginx/site-enabled_aether-nextcloud.conf +++ b/conf/nginx/site-enabled_aether-nextcloud.conf @@ -23,8 +23,8 @@ server { } server { - listen 443 ssl http2; - listen [::]:443 ssl http2; + listen 443 ssl; + listen [::]:443 ssl; server_name nextcloud.oneskyit.com; access_log /logs/nginx/access_oneskyit_nextcloud.log; diff --git a/conf/nginx/site-enabled_aether-phpmyadmin.conf b/conf/nginx/site-enabled_aether-phpmyadmin.conf index d1ea0b4..2c6f45c 100644 --- a/conf/nginx/site-enabled_aether-phpmyadmin.conf +++ b/conf/nginx/site-enabled_aether-phpmyadmin.conf @@ -1,7 +1,7 @@ server { listen 80; listen [::]:80; - + server_name ${DOCKER_PHPMYADMIN_SERVER_NAME}; # server_name phpmyadmin-oneskyit.localhost phpmyadmin.oneskyit.com dev-phpmyadmin.oneskyit.com test-phpmyadmin.oneskyit.com; @@ -25,12 +25,12 @@ server { server { listen 443 ssl; listen [::]:443 ssl; - + # server_name ${DOCKER_PHPMYADMIN_SERVER_NAME}; server_name phpmyadmin-oneskyit.localhost phpmyadmin.oneskyit.com dev-phpmyadmin.oneskyit.com test-phpmyadmin.oneskyit.com; - + access_log /logs/nginx/access_oneskyit_phpmyadmin.log; - + include /etc/nginx/options-ssl-nginx.conf; ssl_certificate /etc/certs/fullchain.pem; diff --git a/conf/nginx/site-enabled_aether_api_v5_fastapi_gunicorn.conf b/conf/nginx/site-enabled_aether_api_v5_fastapi_gunicorn.conf index e9956fd..ee73087 100644 --- a/conf/nginx/site-enabled_aether_api_v5_fastapi_gunicorn.conf +++ b/conf/nginx/site-enabled_aether_api_v5_fastapi_gunicorn.conf @@ -1,7 +1,7 @@ server { listen 80; listen [::]:80; - + server_name ${DOCKER_AE_API_V5_SERVER_NAME} v5-fastapi.localhost api-v5.localhost; # server_name # fastapi_gunicorn.localhost @@ -31,13 +31,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://v5_fastapi_backend; } - + location /ws { proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; @@ -56,7 +56,7 @@ server { # proxy_headers_hash_max_size 1024; proxy_pass http://v5_fastapi_backend; - + access_log /logs/nginx/access_fastapi_gunicorn_ws.log; error_log /logs/nginx/error_fastapi_gunicorn_ws.log; } @@ -66,7 +66,7 @@ server { server { listen 443 ssl; listen [::]:443 ssl; - + server_name ${DOCKER_AE_API_V5_SERVER_NAME} v5-fastapi.localhost api-v5.localhost; # server_name # fastapi_gunicorn.localhost @@ -105,13 +105,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://v5_fastapi_backend; } - + location /ws { proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; @@ -130,7 +130,7 @@ server { # proxy_headers_hash_max_size 1024; proxy_pass http://v5_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_oneskyit.conf b/conf/nginx/site-enabled_oneskyit.conf index 94edbba..5f28634 100644 --- a/conf/nginx/site-enabled_oneskyit.conf +++ b/conf/nginx/site-enabled_oneskyit.conf @@ -1,7 +1,7 @@ server { listen 80; listen [::]:80; - + server_name dev-docker.oneskyit.com test-docker.oneskyit.com prod-docker.oneskyit.com ${DOCKER_OSIT_SERVER_NAME}; # server_name oneskyit.localhost; @@ -46,7 +46,7 @@ server { server { listen 443 ssl; listen [::]:443 ssl; - + # server_name docker.oneskyit.com ${DOCKER_OSIT_SERVER_NAME}; server_name docker.oneskyit.com dev-docker.oneskyit.com test-docker.oneskyit.com prod-docker.oneskyit.com ${DOCKER_OSIT_SERVER_NAME}; # server_name docker.oneskyit.com dev.oneskyit.com test.oneskyit.com prod.oneskyit.com;