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:35:25 +06:00
parent 40f0dda8f0
commit 2f2ca35c1f
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docker-compose.yml
View File

@@ -1,3 +1,5 @@
version: '3.8'
services: services:
frontend: frontend:
build: build:
@@ -9,8 +11,7 @@ services:
- "80:80" - "80:80"
- "443:443" - "443:443"
volumes: volumes:
- certbot-etc:/etc/letsencrypt - certbot-etc:/etc/letsencrypt:ro
- certbot-var:/var/lib/letsencrypt
- webroot:/var/www/html - webroot:/var/www/html
depends_on: depends_on:
- backend - backend
@@ -39,7 +40,7 @@ services:
- webroot:/var/www/html - webroot:/var/www/html
depends_on: depends_on:
- frontend - frontend
command: certonly --webroot --webroot-path=/var/www/html --email admin@itformhelp.ru --agree-tos --no-eff-email --force-renewal -d itformhelp.ru -d www.itformhelp.ru 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
volumes: volumes:
sqlite_data: sqlite_data:

43
docker/nginx/nginx.conf
View File

@@ -1,23 +1,24 @@
server { user nginx;
listen 80; worker_processes auto;
listen [::]:80; error_log /var/log/nginx/error.log notice;
server_name itformhelp.ru www.itformhelp.ru; pid /var/run/nginx.pid;
root /usr/share/nginx/html; events {
index index.html; worker_connections 1024;
}
location / {
try_files $uri $uri/ /index.html; http {
expires -1; include /etc/nginx/mime.types;
add_header Cache-Control "no-store, no-cache, must-revalidate"; default_type application/octet-stream;
}
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
location /api/ { '$status $body_bytes_sent "$http_referer" '
proxy_pass http://backend:8000/api/; '"$http_user_agent" "$http_x_forwarded_for"';
proxy_http_version 1.1;
proxy_set_header Host $host; access_log /var/log/nginx/access.log main;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; sendfile on;
proxy_set_header X-Forwarded-Proto $scheme; keepalive_timeout 65;
}
include /etc/nginx/conf.d/*.conf;
} }