diff options
author | 2020-09-01 13:22:20 +0200 | |
---|---|---|
committer | 2020-09-01 13:22:33 +0200 | |
commit | f180df462c7e9d6118ebe76cea2a8240e40e9801 (patch) | |
tree | ec6e730c1887fc139b512fe92300e87fb512db39 /installation/sdnc-web/src/main | |
parent | c2e94bc482f83a5e3bdd357d884a01b1b723620b (diff) |
fixed sdnc-web proxy for topology api
fixed proxy pass for topology api and synced https
Issue-ID: SDNC-1341
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: Ie45f3fa91a082fd7739e5c040691df5602553c98
Former-commit-id: f2d7e05ffb34afcbbcccc376e6b823725982566a
Diffstat (limited to 'installation/sdnc-web/src/main')
-rw-r--r-- | installation/sdnc-web/src/main/resources/http_site.conf | 5 | ||||
-rw-r--r-- | installation/sdnc-web/src/main/resources/https_site.conf | 24 |
2 files changed, 10 insertions, 19 deletions
diff --git a/installation/sdnc-web/src/main/resources/http_site.conf b/installation/sdnc-web/src/main/resources/http_site.conf index 70554ef0..d62fc8e7 100644 --- a/installation/sdnc-web/src/main/resources/http_site.conf +++ b/installation/sdnc-web/src/main/resources/http_site.conf @@ -61,9 +61,7 @@ server { } } location ~ ^/topology { - if ($request_uri ~* "/topology/(.*)") { - proxy_pass TOPOURL/$1; - } + proxy_pass TOPOURL; } location ~ ^/tiles/ { resolver 1.1.1.1; @@ -84,4 +82,3 @@ server { proxy_pass SDNRPROTOCOL://SDNRHOST:SDNRPORT; } } - diff --git a/installation/sdnc-web/src/main/resources/https_site.conf b/installation/sdnc-web/src/main/resources/https_site.conf index 335aef49..d2d6ecd7 100644 --- a/installation/sdnc-web/src/main/resources/https_site.conf +++ b/installation/sdnc-web/src/main/resources/https_site.conf @@ -75,13 +75,18 @@ server { try_files /help/$args.json $uri; } location ~ ^/transportpce { - try_files $uri $uri/ @backend-transportpce; + if ($request_uri ~* "/transportpce/(.*)") { + proxy_pass TRPCEURL/$1; + } } location ~ ^/topology { - try_files $uri $uri/ @backend-topology; + proxy_pass TOPOURL; } - location ~ ^/tiles { - try_files $uri $uri/ @backend-tiles; + location ~ ^/tiles/ { + resolver 1.1.1.1; + if ($request_uri ~* "/tiles/(.*)") { + proxy_pass TILEURL/$1; + } } location / { try_files $uri $uri/ @backend; @@ -95,15 +100,4 @@ server { location @backend { proxy_pass SDNRPROTOCOL://SDNRHOST:SDNRPORT; } - location @backend-transportpce { - proxy_pass TRPCEURL; - } - location @backend-topology { - proxy_pass TOPOURL; - } - location @backend-tiles { - proxy_pass TILEURL; - } - } - |