[incubator-streampipes] branch dev updated: Change connect master route in nginx config

[ze...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git


The following commit(s) were added to refs/heads/dev by this push:
     new 427a7ef  Change connect master route in nginx config
427a7ef is described below

commit 427a7efa52013a399c75345b06e981d54801d11e
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Tue Nov 24 10:29:27 2020 +0100

    Change connect master route in nginx config
---
 ui/nginx_config/default.conf | 4 ----
 ui/nginx_config/ssl.conf     | 6 ++----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ui/nginx_config/default.conf b/ui/nginx_config/default.conf
index 48fd258..344f689 100644
--- a/ui/nginx_config/default.conf
+++ b/ui/nginx_config/default.conf
@@ -59,15 +59,11 @@ server {
 
   location /streampipes-connect/ {
     set $upstream backend:8030;
-#    set $upstream connect-master:8099;
 
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header X-NginX-Proxy true;
     proxy_pass http://$upstream;
-;     if ($request_uri ~* "/streampipes-connect/(.*)") {
-;                 proxy_pass  http://connect-master:8099/$1;
-;     }
     proxy_ssl_session_reuse off;
     proxy_set_header Host $http_host;
   }
diff --git a/ui/nginx_config/ssl.conf b/ui/nginx_config/ssl.conf
index ac00fab..91afa25 100644
--- a/ui/nginx_config/ssl.conf
+++ b/ui/nginx_config/ssl.conf
@@ -53,14 +53,12 @@ server {
   }
 
   location /streampipes-connect/ {
-  #    set $upstream connect-master:8099;
+    set $upstream backend:8030;
 
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header X-NginX-Proxy true;
-    if ($request_uri ~* "/streampipes-connect/(.*)") {
-      proxy_pass  http://connect-master:8099/$1;
-    }
+    proxy_pass http://$upstream;
     proxy_ssl_session_reuse off;
     proxy_set_header Host $http_host;
   }