diff --git a/docker/nginx/conf.d/default.conf b/docker/nginx/conf.d/default.conf index 1ce0908..d2b8287 100644 --- a/docker/nginx/conf.d/default.conf +++ b/docker/nginx/conf.d/default.conf @@ -1,3 +1,4 @@ +# Redirect HTTP to HTTPS server { listen 80; listen [::]:80; @@ -9,38 +10,9 @@ server { } location / { - return 301 https://$host$request_uri; - } -} - -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; - - # SSL configuration - ssl_session_timeout 1d; - ssl_session_cache shared:SSL:50m; - ssl_session_tickets off; - - # Modern configuration - 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; - - # HSTS (uncomment if you're sure) - # add_header Strict-Transport-Security "max-age=63072000" always; - - root /usr/share/nginx/html; - index index.html; - - location / { + root /usr/share/nginx/html; + index index.html; try_files $uri $uri/ /index.html; - expires -1; - add_header Cache-Control "no-store, no-cache, must-revalidate"; } location /api/ { @@ -50,8 +22,45 @@ server { 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; } -} \ No newline at end of file +} + +# 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; +# } +#}