Merge "Add all missing specific devicemanagers" into guilin

diff --git a/installation/sdnc-web/src/main/resources/http_site.conf b/installation/sdnc-web/src/main/resources/http_site.conf
index 53356b4..ea6c33b 100644 (file)
--- a/installation/sdnc-web/src/main/resources/http_site.conf
+++ b/installation/sdnc-web/src/main/resources/http_site.conf
@@ -72,11 +72,11 @@ 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;

diff --git a/installation/sdnc-web/src/main/resources/https_site.conf b/installation/sdnc-web/src/main/resources/https_site.conf
index da86272..5e61fec 100644 (file)
--- a/installation/sdnc-web/src/main/resources/https_site.conf
+++ b/installation/sdnc-web/src/main/resources/https_site.conf
@@ -91,11 +91,11 @@ 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;