From: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>
Date: Mon, 26 Oct 2020 17:14:52 +0000 (+0000)
Subject: Merge "Add all missing specific devicemanagers" into guilin
X-Git-Tag: 2.0.3~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=255c71d969f82d71c0c5e882390823ab95d059c1;hp=a86abbdceb7356c79f063c9b9b88a5c2f4ac3237;p=sdnc%2Foam.git

Merge "Add all missing specific devicemanagers" into guilin

Former-commit-id: 682b52483b4ec58df21526d6308dfe95cc087b64
---

diff --git a/installation/sdnc-web/src/main/resources/http_site.conf b/installation/sdnc-web/src/main/resources/http_site.conf
index 53356b43..ea6c33be 100644
--- 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 da86272d..5e61fece 100644
--- 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;