From f180df462c7e9d6118ebe76cea2a8240e40e9801 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michael=20D=C3=BCrre?=
 <michael.duerre@highstreet-technologies.com>
Date: Tue, 1 Sep 2020 13:22:20 +0200
Subject: [PATCH] fixed sdnc-web proxy for topology api
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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
---
 .../sdnc-web/src/main/resources/http_site.conf     |  5 +----
 .../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;
-    }
-
 }
-
-- 
2.16.6