Commit 9409acfe44251fc2591b4e957eea4f5e5b5e930d
Committed by
GitHub
Merge pull request #3939 from Dmitriymush/fix/docker_haproxy
[3.2.x]Fixed: "/static/widgets/" included to acl path_beg of haproxy configuration
Showing
2 changed files
with
5 additions
and
5 deletions
... | ... | @@ -58,7 +58,7 @@ frontend http-in |
58 | 58 | |
59 | 59 | acl transport_http_acl path_beg /api/v1/ |
60 | 60 | acl letsencrypt_http_acl path_beg /.well-known/acme-challenge/ |
61 | - acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/ | |
61 | + acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/ /static/widgets/ | |
62 | 62 | |
63 | 63 | redirect scheme https if !letsencrypt_http_acl !transport_http_acl { env(FORCE_HTTPS_REDIRECT) -m str true } |
64 | 64 | |
... | ... | @@ -76,7 +76,7 @@ frontend https_in |
76 | 76 | reqadd X-Forwarded-Proto:\ https |
77 | 77 | |
78 | 78 | acl transport_http_acl path_beg /api/v1/ |
79 | - acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/ | |
79 | + acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/ /static/widgets/ | |
80 | 80 | |
81 | 81 | use_backend tb-http-backend if transport_http_acl |
82 | 82 | use_backend tb-api-backend if tb_api_acl | ... | ... |
... | ... | @@ -26,15 +26,15 @@ const PROXY_CONFIG = { |
26 | 26 | "target": ruleNodeUiforwardUrl, |
27 | 27 | "secure": false, |
28 | 28 | }, |
29 | - "/oauth2": { | |
29 | + "/static/widgets": { | |
30 | 30 | "target": forwardUrl, |
31 | 31 | "secure": false, |
32 | 32 | }, |
33 | - "/login/oauth2": { | |
33 | + "/oauth2": { | |
34 | 34 | "target": forwardUrl, |
35 | 35 | "secure": false, |
36 | 36 | }, |
37 | - "/static": { | |
37 | + "/login/oauth2": { | |
38 | 38 | "target": forwardUrl, |
39 | 39 | "secure": false, |
40 | 40 | }, | ... | ... |