From adcd5e8035b378fb74e0718a7ab15c89252359af Mon Sep 17 00:00:00 2001 From: qy117121 Date: Thu, 23 Feb 2023 22:34:37 +0800 Subject: [PATCH] update --- nginx/arm.stpl | 69 ++++++++++++++++++++----------------------------- nginx/ws.stpl | 2 +- nginx/xray.stpl | 33 +++++++---------------- 3 files changed, 38 insertions(+), 66 deletions(-) diff --git a/nginx/arm.stpl b/nginx/arm.stpl index ffe4941..13a4b78 100644 --- a/nginx/arm.stpl +++ b/nginx/arm.stpl @@ -33,51 +33,38 @@ server { expires max; try_files $uri @fallback; } - } + } - location /sky { - proxy_redirect off; - proxy_pass http://127.0.0.1:23876; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - } - - - location /a552d878db04/ - { - proxy_redirect off; + location /a552d878db04/ { + proxy_redirect off; proxy_pass http://127.0.0.1:30875; - proxy_http_version 1.1; - proxy_set_header X-Real-IP \$remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $http_host; - } -location /portainer/ { - proxy_http_version 1.1; - proxy_set_header Host $http_host; # required for docker client's sake - proxy_set_header X-Real-IP $remote_addr; # pass on real client's IP - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_read_timeout 900; + proxy_http_version 1.1; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $http_host; + } + + location /portainer/ { + proxy_http_version 1.1; + proxy_set_header Host $http_host; # required for docker client's sake + proxy_set_header X-Real-IP $remote_addr; # pass on real client's IP + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_read_timeout 900; - proxy_set_header Connection ""; - proxy_buffers 32 4k; - proxy_pass https://portainer/; - } - - location /portainer/api/websocket/ { - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - proxy_pass https://portainer/api/websocket/; - } + proxy_set_header Connection ""; + proxy_buffers 32 4k; + proxy_pass https://portainer/; + } + location /portainer/api/websocket/ { + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + proxy_pass https://portainer/api/websocket/; + } location /error/ { alias %home%/%user%/web/%domain%/document_errors/; diff --git a/nginx/ws.stpl b/nginx/ws.stpl index a8b0ce1..0b8175c 100644 --- a/nginx/ws.stpl +++ b/nginx/ws.stpl @@ -25,7 +25,7 @@ server { } } - location /sky { + location /sky { proxy_redirect off; proxy_pass http://127.0.0.1:23876; proxy_http_version 1.1; diff --git a/nginx/xray.stpl b/nginx/xray.stpl index 8cdc1ff..0f33c64 100644 --- a/nginx/xray.stpl +++ b/nginx/xray.stpl @@ -15,7 +15,6 @@ server { include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; add_header Strict-Transport-Security "max-age=63072000" always; - location / { proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(%proxy_extensions%)$ { @@ -26,31 +25,17 @@ server { try_files $uri @fallback; } } - - location /sky { - proxy_redirect off; - proxy_pass http://127.0.0.1:23876; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - } - - location /a552d878db04/ - { - proxy_redirect off; + location /a552d878db04/ { + proxy_redirect off; proxy_pass http://127.0.0.1:30875; - proxy_http_version 1.1; - proxy_set_header X-Real-IP \$remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $http_host; - } - + proxy_http_version 1.1; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $http_host; + } location /error/ { alias %home%/%user%/web/%domain%/document_errors/;