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:20:55 +06:00
parent e560cf53e7
commit c26bd47965
2 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.yml
View File

@@ -39,7 +39,9 @@ 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
command: certonly --webroot --webroot-path=/var/www/html --email admin@itformhelp.ru --agree-tos --no-eff-email --staging -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:

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

@@ -1,33 +1,17 @@
# HTTP server for ACME challenge
server { server {
listen 80; listen 80;
listen [::]:80; listen [::]:80;
server_name itformhelp.ru www.itformhelp.ru; server_name itformhelp.ru www.itformhelp.ru;
# Allow only ACME challenge and redirect everything else to HTTPS # Для Let's Encrypt
location ^~ /.well-known/acme-challenge/ { location /.well-known/acme-challenge/ {
default_type "text/plain"; allow all;
root /var/www/html; root /var/www/html;
} }
location / { location / {
return 301 https://$server_name$request_uri;
}
}
HTTPS server (commented out until we have certificates)
server {
listen 443 ssl http2;
listen [::]:443 ssl http2;
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;
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; expires -1;
add_header Cache-Control "no-store, no-cache, must-revalidate"; add_header Cache-Control "no-store, no-cache, must-revalidate";
@@ -40,5 +24,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;
} }
} }