1
0
mirror of https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git synced 2025-08-14 00:25:46 +02:00

Merge remote changes and resolve conflicts

This commit is contained in:
MoonTestUse1
2024-12-25 03:12:47 +06:00
parent e9185ce968
commit 13f858f385

View File

@@ -15,30 +15,30 @@ server {
}
}
# HTTPS server (commented out until we have certificates)
#server {
# listen 443 ssl http2;
# listen [::]:443 ssl http2;
# server_name itformhelp.ru www.itformhelp.ru;
#
# ssl_certificate /etc/letsencrypt/live/itformhelp.ru/fullchain.pem;
# ssl_certificate_key /etc/letsencrypt/live/itformhelp.ru/privkey.pem;
#
# root /usr/share/nginx/html;
# index index.html;
#
# location / {
# try_files $uri $uri/ /index.html;
# expires -1;
# add_header Cache-Control "no-store, no-cache, must-revalidate";
# }
#
# location /api/ {
# proxy_pass http://backend:8000/api/;
# proxy_http_version 1.1;
# proxy_set_header Host $host;
# proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# proxy_set_header X-Forwarded-Proto $scheme;
# }
#}
HTTPS server (commented out until we have certificates)
server {
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name itformhelp.ru www.itformhelp.ru;
ssl_certificate /etc/letsencrypt/live/itformhelp.ru/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/itformhelp.ru/privkey.pem;
root /usr/share/nginx/html;
index index.html;
location / {
try_files $uri $uri/ /index.html;
expires -1;
add_header Cache-Control "no-store, no-cache, must-revalidate";
}
location /api/ {
proxy_pass http://backend:8000/api/;
proxy_http_version 1.1;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}
}