From 9b5a406d91bce63aa9e6b533fcb94feaaaf51a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=9F=D1=80=D0=B8=D0=BC=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Wed, 16 Feb 2022 20:48:15 +0300 Subject: [PATCH] INNOJS-16 --- 80.conf | 7 ++----- parts/api-multystub.conf | 35 +++++++++++++++++++++++++---------- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/80.conf b/80.conf index 0ecbf39..a59d31c 100644 --- a/80.conf +++ b/80.conf @@ -97,17 +97,14 @@ server { ssl_certificate_key /etc/letsencrypt/live/inno-js.ru/privkey.pem; ssl_trusted_certificate /etc/letsencrypt/live/inno-js.ru/chain.pem; - set $appsRoot "/home/ijl/ijl/apps"; - root $appsRoot; - include /etc/nginx/snippets/ssl-params.conf; location / { - add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Origin' '*.inno-js.ru'; add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range'; - alias "$appsRoot/"; + alias "/home/ijl/ijl/apps/"; } } diff --git a/parts/api-multystub.conf b/parts/api-multystub.conf index 3de48d9..52d16ed 100644 --- a/parts/api-multystub.conf +++ b/parts/api-multystub.conf @@ -14,14 +14,29 @@ location /multystub/ { proxy_pass http://multystub/; } -location /websocket/ { - proxy_http_version 1.1; - proxy_pass http://websocket/api/socket.io/; - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_read_timeout 3600s; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; +location /socket.io/ { + + proxy_pass http://websocket; + + proxy_http_version 1.1; + proxy_redirect off; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + + proxy_read_timeout 3600s; + + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + proxy_set_header Upgrade $http_upgrade; + # proxy_set_header Connection $connection_upgrade; + proxy_set_header Connection "Upgrade"; +} + +location /static/ { + add_header 'Access-Control-Allow-Origin' '*.inno-js.ru'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; + add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range'; + alias "/home/ijl/ijl/apps/"; }