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:33:42 +06:00
parent 4850b04274
commit 9f01a5bae5
2 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
docker-compose.yml
View File

@@ -1,5 +1,3 @@
version: '3.8'
services: services:
frontend: frontend:
build: build:
@@ -9,7 +7,6 @@ services:
restart: unless-stopped restart: unless-stopped
ports: ports:
- "80:80" - "80:80"
- "443:443"
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
@@ -29,20 +26,9 @@ services:
volumes: volumes:
- ./backend:/app - ./backend:/app
- sqlite_data:/app/instance - sqlite_data:/app/instance
ports:
certbot: - "8000:8000"
image: certbot/certbot
container_name: certbot
volumes:
- certbot-etc:/etc/letsencrypt
- certbot-var:/var/lib/letsencrypt
- webroot:/var/www/html
depends_on:
- 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-var:
webroot: webroot:

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

@@ -3,7 +3,6 @@ server {
listen [::]:80; listen [::]:80;
server_name itformhelp.ru www.itformhelp.ru; server_name itformhelp.ru www.itformhelp.ru;
# Для Let's Encrypt
location /.well-known/acme-challenge/ { location /.well-known/acme-challenge/ {
allow all; allow all;
root /var/www/html; root /var/www/html;
@@ -13,8 +12,6 @@ server {
root /usr/share/nginx/html; root /usr/share/nginx/html;
index index.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/ {
@@ -24,8 +21,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;
} }
} }