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 04:06:06 +06:00
parent 133ab10644
commit 0b16c2f0cf
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docker-compose.yml
View File

@@ -29,6 +29,8 @@ services:
volumes: volumes:
- ./backend:/app - ./backend:/app
- sqlite_data:/app/instance - sqlite_data:/app/instance
ports:
- "8000:8000"
certbot: certbot:
image: certbot/certbot image: certbot/certbot
@@ -37,9 +39,8 @@ services:
- certbot-etc:/etc/letsencrypt - certbot-etc:/etc/letsencrypt
- certbot-var:/var/lib/letsencrypt - certbot-var:/var/lib/letsencrypt
- webroot:/var/www/html - webroot:/var/www/html
depends_on: command: certonly --webroot --webroot-path=/var/www/html --email admin@itformhelp.ru --agree-tos --no-eff-email --force-renewal --staging -d itformhelp.ru -d www.itformhelp.ru
- frontend
command: certonly --webroot --webroot-path=/var/www/html --email admin@itformhelp.ru --agree-tos --no-eff-email -d itformhelp.ru -d www.itformhelp.ru
volumes: volumes:
sqlite_data: sqlite_data:
certbot-etc: certbot-etc:

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

@@ -3,17 +3,16 @@ server {
listen [::]:80; listen [::]:80;
server_name itformhelp.ru www.itformhelp.ru; server_name itformhelp.ru www.itformhelp.ru;
root /usr/share/nginx/html;
index index.html;
location ~ /.well-known/acme-challenge { location ~ /.well-known/acme-challenge {
allow all; allow all;
root /var/www/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/ {
@@ -23,8 +22,5 @@ server {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_connect_timeout 60s;
proxy_send_timeout 60s;
proxy_read_timeout 60s;
} }
} }