From 20a4163cce171278978b4c37d4c834980a9cbbbe Mon Sep 17 00:00:00 2001 From: Dmitriymush Date: Wed, 13 Jan 2021 16:40:50 +0200 Subject: [PATCH] fix additions --- docker/haproxy/config/haproxy.cfg | 4 ++-- ui-ngx/proxy.conf.js | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/haproxy/config/haproxy.cfg b/docker/haproxy/config/haproxy.cfg index 663d19a59c..5ff76cfdcd 100644 --- a/docker/haproxy/config/haproxy.cfg +++ b/docker/haproxy/config/haproxy.cfg @@ -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/ /static/ + 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/ /static/ + 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 diff --git a/ui-ngx/proxy.conf.js b/ui-ngx/proxy.conf.js index 5be6bde1d1..265b183225 100644 --- a/ui-ngx/proxy.conf.js +++ b/ui-ngx/proxy.conf.js @@ -27,6 +27,10 @@ const PROXY_CONFIG = { "target": ruleNodeUiforwardUrl, "secure": false, }, + "/static/widgets": { + "target": forwardUrl, + "secure": false, + }, "/oauth2": { "target": forwardUrl, "secure": false, @@ -35,10 +39,6 @@ const PROXY_CONFIG = { "target": forwardUrl, "secure": false, }, - "/static": { - "target": forwardUrl, - "secure": false, - }, "/api/ws": { "target": wsForwardUrl, "ws": true,