mirror of
https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git
synced 2025-08-14 00:25:46 +02:00
Merge remote changes and resolve conflicts
This commit is contained in:
@@ -1,36 +1,19 @@
|
|||||||
# HTTP server for ACME challenge
|
# Временная конфигурация только для HTTP
|
||||||
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";
|
|
||||||
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;
|
|
||||||
add_header Cache-Control "no-store, no-cache, must-revalidate";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
location /api/ {
|
location /api/ {
|
||||||
|
Reference in New Issue
Block a user