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

Merge remote changes and resolve conflicts

Browse Source
This commit is contained in:
MoonTestUse1
2024-12-25 03:38:58 +06:00
parent 9f01a5bae5
commit d7b08d09b0
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@@ -10,7 +10,6 @@ services:
volumes: volumes:
- ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
- ./docker/nginx/conf.d:/etc/nginx/conf.d:ro - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro
- webroot:/var/www/html
depends_on: depends_on:
- backend - backend
@@ -31,4 +30,3 @@ services:
volumes: volumes:
sqlite_data: sqlite_data:
webroot:

10
docker/nginx/conf.d/default.conf
View File

@@ -3,15 +3,13 @@ server {
listen [::]:80; listen [::]:80;
server_name itformhelp.ru www.itformhelp.ru; server_name itformhelp.ru www.itformhelp.ru;
location /.well-known/acme-challenge/ { root /usr/share/nginx/html;
allow all; index index.html;
root /var/www/html;
}
location / { location / {
root /usr/share/nginx/html;
index index.html;
try_files $uri $uri/ /index.html; try_files $uri $uri/ /index.html;
expires -1;
add_header Cache-Control "no-store, no-cache, must-revalidate";
} }
location /api/ { location /api/ {