fixed websocket forwarding
[sdnc/oam.git] / installation / sdnc-web / src / main / resources / http_site.conf
index 70554ef..ea6c33b 100644 (file)
@@ -61,12 +61,10 @@ server {
         }
     }
     location ~ ^/topology  {
-        if ($request_uri ~* "/topology/(.*)") { 
-            proxy_pass TOPOURL/$1;
-        }
+        proxy_pass TOPOURL;
     }
     location ~ ^/tiles/  {
-        resolver 1.1.1.1;
+        resolver DNS_RESOLVER;
         if ($request_uri ~* "/tiles/(.*)") { 
             proxy_pass TILEURL/$1;
         }
@@ -74,14 +72,13 @@ server {
     location /  {
         try_files $uri $uri/ @backend;
     }
-    location ^/websocket$ {
+    location /websocket {
         proxy_pass SDNRPROTOCOL://SDNRHOST:SDNRPORT/websocket;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
+        proxy_set_header Connection "upgrade";
     }
     location @backend {
         proxy_pass SDNRPROTOCOL://SDNRHOST:SDNRPORT;
     }
 }
-