merge main

This commit is contained in:
StyleZhang
2024-03-26 15:25:02 +08:00
34 changed files with 443 additions and 214 deletions

View File

@ -343,8 +343,10 @@ services:
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
- ./nginx/proxy.conf:/etc/nginx/proxy.conf
- ./nginx/conf.d:/etc/nginx/conf.d
#- ./nginx/ssl:/etc/ssl
depends_on:
- api
- web
ports:
- "80:80"
#- "443:443"

View File

@ -26,4 +26,13 @@ server {
proxy_pass http://web:3000;
include proxy.conf;
}
}
# If you want to support HTTPS, please uncomment the code snippet below
#listen 443 ssl;
#ssl_certificate ./../ssl/your_cert_file.cer;
#ssl_certificate_key ./../ssl/your_cert_key.key;
#ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
#ssl_prefer_server_ciphers on;
#ssl_session_cache shared:SSL:10m;
#ssl_session_timeout 10m;
}

View File

@ -0,0 +1 @@