update sdnc-web image

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

2 files changed, 98 insertions, 65 deletions

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;
+    }
 }
 
diff --git a/installation/sdnc-web/src/main/resources/https_site.conf b/installation/sdnc-web/src/main/resources/https_site.conf
index 5dc4cfba..335aef49 100644
--- a/installation/sdnc-web/src/main/resources/https_site.conf
+++ b/installation/sdnc-web/src/main/resources/https_site.conf
@@ -40,52 +40,70 @@
 # Default server configuration
 #
 server {
-	listen WEBPORT ssl default_server ;
-	listen [::]:WEBPORT ssl default_server;
+    listen WEBPORT ssl default_server ;
+    listen [::]:WEBPORT ssl default_server;
 
-	# SSL configuration
-	#
-	# listen 443 ssl default_server;
-	# listen [::]:443 ssl default_server;
-	#
-	# Note: You should disable gzip for SSL traffic.
-	# See: https://bugs.debian.org/773332
-	#
-	# Read up on ssl_ciphers to ensure a secure configuration.
-	# See: https://bugs.debian.org/765782
-	#
-	# Self signed certs generated by the ssl-cert package
-	# Don't use them in a production server!
-	#
-	# include snippets/snakeoil.conf;
+    # SSL configuration
+    #
+    # listen 443 ssl default_server;
+    # listen [::]:443 ssl default_server;
+    #
+    # Note: You should disable gzip for SSL traffic.
+    # See: https://bugs.debian.org/773332
+    #
+    # Read up on ssl_ciphers to ensure a secure configuration.
+    # See: https://bugs.debian.org/765782
+    #
+    # Self signed certs generated by the ssl-cert package
+    # Don't use them in a production server!
+    #
+    # include snippets/snakeoil.conf;
 
-	ssl_certificate SSL_CERT_DIR/SSL_CERTIFICATE;
-	ssl_certificate_key SSL_CERT_DIR/SSL_CERTIFICATE_KEY;
-	
-#	root /var/www;
+    ssl_certificate SSL_CERT_DIR/SSL_CERTIFICATE;
+    ssl_certificate_key SSL_CERT_DIR/SSL_CERTIFICATE_KEY;
 
-	index index.html index.htm index.nginx-debian.html;
+#   root /var/www;
 
-	server_name _;
+    index index.html index.htm index.nginx-debian.html;
 
-	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  {
+        try_files $uri $uri/ @backend-transportpce;
+    }
+    location ~ ^/topology  {
+        try_files $uri $uri/ @backend-topology;
+    }
+    location ~ ^/tiles  {
+        try_files $uri $uri/ @backend-tiles;
+    }
+    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;
+    }
+    location @backend-transportpce {
+        proxy_pass TRPCEURL;
+    }
+    location @backend-topology {
+        proxy_pass TOPOURL;
+    }
+    location @backend-tiles {
+        proxy_pass TILEURL;
+    }
 
 }