From: Dan Timoney <dtimoney@att.com>
Date: Tue, 1 Sep 2020 18:27:27 +0000 (+0000)
Subject: Merge "adapt sdnc-image to latest baseimage"
X-Git-Tag: 2.0.1~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=cf6eb9744f6db8753fe05a9575045d82bf6f873f;hp=25db839a60d5cc9db59e8e8b8e0c26c8fc69068c;p=sdnc%2Foam.git

Merge "adapt sdnc-image to latest baseimage"

Former-commit-id: 3330eabdac41dfabd0509bbf7a0f44f03cc1844b
---

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;
-    }
-
 }
-