From 4c984ce4f2cc4ef71b21134735b57d80ab09c6b1 Mon Sep 17 00:00:00 2001
From: Michael Dürre <michael.duerre@highstreet-technologies.com>
Date: Mon, 31 Aug 2020 06:36:53 +0200
Subject: update sdnc-web image
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cleanup installation and add more proxy fn

Issue-ID: SDNC-1337
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: Id5fcee41dd43d4935b08b821521c6036c321b2e7
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>

Former-commit-id: c553802849a383176eca863fc35694426f9d31cb
---
 .../sdnc-web/src/main/resources/http_site.conf     | 63 +++++++++++++---------
 1 file changed, 39 insertions(+), 24 deletions(-)

(limited to 'installation/sdnc-web/src/main/resources/http_site.conf')

diff --git a/installation/sdnc-web/src/main/resources/http_site.conf b/installation/sdnc-web/src/main/resources/http_site.conf
index 640668a1..70554ef0 100644
--- a/installation/sdnc-web/src/main/resources/http_site.conf
+++ b/installation/sdnc-web/src/main/resources/http_site.conf
@@ -40,33 +40,48 @@
 # Default server configuration
 #
 server {
-	listen WEBPORT default_server ;
-	listen [::]:WEBPORT default_server;
+    listen WEBPORT default_server ;
+    listen [::]:WEBPORT default_server;
 
-#	root /var/www;
+#   root /var/www;
 
-	index index.html index.htm index.nginx-debian.html;
+    index index.html index.htm index.nginx-debian.html;
 
-	server_name _;
-
-	location ~ ^/$  {
-		return 301 /odlux/index.html;
-	}
-	location ~ /help/$  {
-		try_files /help/$args.json $uri;
-	}
-	location /  {
-		try_files $uri $uri/ @backend;
-	}
-	location /websocket {
-		proxy_pass SDNRPROTOCOL://SDNRHOST:SDNRPORT/websocket;
-		proxy_http_version 1.1;
-		proxy_set_header Upgrade $http_upgrade;
-	        proxy_set_header Connection "upgrade";
-	}
-	location @backend {
-		proxy_pass SDNRPROTOCOL://SDNRHOST:SDNRPORT;
-	}
+    server_name _;
 
+    location ~ ^/$  {
+        return 301 /odlux/index.html;
+    }
+    location ~ ^/help/$  {
+        try_files /help/$args.json $uri;
+    }
+    location ~ ^/transportpce  {
+        if ($request_uri ~* "/transportpce/(.*)") { 
+            proxy_pass TRPCEURL/$1;
+        }
+    }
+    location ~ ^/topology  {
+        if ($request_uri ~* "/topology/(.*)") { 
+            proxy_pass TOPOURL/$1;
+        }
+    }
+    location ~ ^/tiles/  {
+        resolver 1.1.1.1;
+        if ($request_uri ~* "/tiles/(.*)") { 
+            proxy_pass TILEURL/$1;
+        }
+    }
+    location /  {
+        try_files $uri $uri/ @backend;
+    }
+    location ^/websocket$ {
+        proxy_pass SDNRPROTOCOL://SDNRHOST:SDNRPORT/websocket;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+    }
+    location @backend {
+        proxy_pass SDNRPROTOCOL://SDNRHOST:SDNRPORT;
+    }
 }
 
-- 
cgit 1.2.3-korg