From: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>
Date: Mon, 26 Oct 2020 17:15:03 +0000 (+0000)
Subject: Merge "Add all missing specific devicemanagers"
X-Git-Tag: 2.1.0~18
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=cc70bead590ac4423a5e3f5a98bc26571ef9a4cb;hp=45332eb4c99ee8fa6ff43838d041684284cb5f77

Merge "Add all missing specific devicemanagers"

Former-commit-id: c3499b3deb41ec4ba7e7b184b5ee9266e9d180f6
---

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;