Browse Source
Merge pull request #3939 from Dmitriymush/fix/docker_haproxy
[3.2.x]Fixed: "/static/widgets/" included to acl path_beg of haproxy configuration
pull/3949/head
Igor Kulikov
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
5 additions and
5 deletions
-
docker/haproxy/config/haproxy.cfg
-
ui-ngx/proxy.conf.js
|
|
|
@ -58,7 +58,7 @@ frontend http-in |
|
|
|
|
|
|
|
acl transport_http_acl path_beg /api/v1/ |
|
|
|
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 } |
|
|
|
|
|
|
|
@ -76,7 +76,7 @@ frontend https_in |
|
|
|
reqadd X-Forwarded-Proto:\ https |
|
|
|
|
|
|
|
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-api-backend if tb_api_acl |
|
|
|
|
|
|
|
@ -26,15 +26,15 @@ const PROXY_CONFIG = { |
|
|
|
"target": ruleNodeUiforwardUrl, |
|
|
|
"secure": false, |
|
|
|
}, |
|
|
|
"/oauth2": { |
|
|
|
"/static/widgets": { |
|
|
|
"target": forwardUrl, |
|
|
|
"secure": false, |
|
|
|
}, |
|
|
|
"/login/oauth2": { |
|
|
|
"/oauth2": { |
|
|
|
"target": forwardUrl, |
|
|
|
"secure": false, |
|
|
|
}, |
|
|
|
"/static": { |
|
|
|
"/login/oauth2": { |
|
|
|
"target": forwardUrl, |
|
|
|
"secure": false, |
|
|
|
}, |
|
|
|
|
