dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3939 from Dmitriymush/fix/docker_haproxy

Browse Source 
[3.2.x]Fixed: "/static/widgets/" included to acl path_beg of haproxy configuration
This commit is contained in:
Igor Kulikov 2021-01-14 10:24:06 +02:00 committed by GitHub
commit 9409acfe44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/haproxy/config/haproxy.cfg
View File

@ -58,7 +58,7 @@ frontend http-in
acl transport_http_acl path_beg /api/v1/ acl transport_http_acl path_beg /api/v1/
acl letsencrypt_http_acl path_beg /.well-known/acme-challenge/ acl letsencrypt_http_acl path_beg /.well-known/acme-challenge/
acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/ acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/ /static/widgets/
redirect scheme https if !letsencrypt_http_acl !transport_http_acl { env(FORCE_HTTPS_REDIRECT) -m str true } redirect scheme https if !letsencrypt_http_acl !transport_http_acl { env(FORCE_HTTPS_REDIRECT) -m str true }
@ -76,7 +76,7 @@ frontend https_in
reqadd X-Forwarded-Proto:\ https reqadd X-Forwarded-Proto:\ https
acl transport_http_acl path_beg /api/v1/ acl transport_http_acl path_beg /api/v1/
acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/ acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/ /static/widgets/
use_backend tb-http-backend if transport_http_acl use_backend tb-http-backend if transport_http_acl
use_backend tb-api-backend if tb_api_acl use_backend tb-api-backend if tb_api_acl

8
ui-ngx/proxy.conf.js
View File

@ -26,6 +26,10 @@ const PROXY_CONFIG = {
"target": ruleNodeUiforwardUrl, "target": ruleNodeUiforwardUrl,
"secure": false, "secure": false,
}, },
"/static/widgets": {
"target": forwardUrl,
"secure": false,
},
"/oauth2": { "/oauth2": {
"target": forwardUrl, "target": forwardUrl,
"secure": false, "secure": false,
@ -34,10 +38,6 @@ const PROXY_CONFIG = {
"target": forwardUrl, "target": forwardUrl,
"secure": false, "secure": false,
}, },
"/static": {
"target": forwardUrl,
"secure": false,
},
"/api/ws": { "/api/ws": {
"target": wsForwardUrl, "target": wsForwardUrl,
"ws": true, "ws": true,