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 02:48:29 +06:00
parent 2c6286e4e8
commit 88a47962df
2 changed files with 40 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
docker-compose.yml
View File

@@ -13,9 +13,8 @@ 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
- certbot-etc:/etc/letsencrypt - ./certbot/www:/var/www/html:ro
- certbot-var:/var/lib/letsencrypt - ./certbot/conf:/etc/letsencrypt:ro
- webroot:/var/www/html
depends_on: depends_on:
- backend - backend
@@ -35,17 +34,12 @@ services:
- "8000:8000" - "8000:8000"
certbot: certbot:
image: certbot/certbot image: certbot/certbot:latest
container_name: certbot container_name: certbot
volumes: volumes:
- certbot-etc:/etc/letsencrypt - ./certbot/conf:/etc/letsencrypt:rw
- certbot-var:/var/lib/letsencrypt - ./certbot/www:/var/www/html:rw
- webroot:/var/www/html 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
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:

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

@@ -1,18 +1,44 @@
# Redirect HTTP to HTTPS
server { server {
listen 80; listen 80;
listen [::]:80; listen [::]:80;
server_name itformhelp.ru www.itformhelp.ru; server_name itformhelp.ru www.itformhelp.ru;
location ~ /.well-known/acme-challenge { location /.well-known/acme-challenge/ {
allow all; allow all;
root /var/www/html; root /var/www/html;
try_files $uri =404;
} }
location / { location / {
return 301 https://$host$request_uri;
}
}
server {
listen 443 default_server ssl;
listen [::]:443 ssl;
http2 on;
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;
ssl_session_timeout 1d;
ssl_session_cache shared:SSL:50m;
ssl_session_tickets off;
ssl_protocols TLSv1.2 TLSv1.3;
ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
ssl_prefer_server_ciphers off;
root /usr/share/nginx/html; root /usr/share/nginx/html;
index index.html; index index.html;
location / {
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/ {
@@ -22,45 +48,8 @@ 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;
} }
} }
# HTTPS server
#server {
# listen 443 ssl;
# listen [::]:443 ssl;
# http2 on;
# 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;
#
# ssl_session_timeout 1d;
# ssl_session_cache shared:SSL:50m;
# ssl_session_tickets off;
#
# ssl_protocols TLSv1.2 TLSv1.3;
# ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
# ssl_prefer_server_ciphers off;
#
# 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;
# proxy_connect_timeout 60s;
# proxy_send_timeout 60s;
# proxy_read_timeout 60s;
# }
#}