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:53:35 +06:00
parent 88a47962df
commit fbdccda6a3
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
docker-compose.yml
View File

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

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

@@ -3,9 +3,11 @@ server {
listen [::]:80; listen [::]:80;
server_name itformhelp.ru www.itformhelp.ru; server_name itformhelp.ru www.itformhelp.ru;
location /.well-known/acme-challenge/ {
allow all;
root /var/www/html; root /var/www/html;
location ^~ /.well-known/acme-challenge/ {
allow all;
default_type "text/plain";
try_files $uri =404; try_files $uri =404;
} }
@@ -15,23 +17,13 @@ server {
} }
server { server {
listen 443 default_server ssl; listen 443 ssl http2 default_server;
listen [::]:443 ssl; listen [::]:443 ssl http2 default_server;
http2 on;
server_name itformhelp.ru www.itformhelp.ru; server_name itformhelp.ru www.itformhelp.ru;
ssl_certificate /etc/letsencrypt/live/itformhelp.ru/fullchain.pem; ssl_certificate /etc/letsencrypt/live/itformhelp.ru/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/itformhelp.ru/privkey.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;