You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2022/02/07 15:57:26 UTC

[incubator-streampipes] branch experimental-module-federation-494 updated: [hotfix] Remove unused routes from Nginx config

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

riemer pushed a commit to branch experimental-module-federation-494
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git


The following commit(s) were added to refs/heads/experimental-module-federation-494 by this push:
     new e39487f  [hotfix] Remove unused routes from Nginx config
e39487f is described below

commit e39487f8cd40ef6ec1c65d38ba5271c67dcebb5b
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Mon Feb 7 16:57:10 2022 +0100

    [hotfix] Remove unused routes from Nginx config
---
 ui/nginx_config/default.conf | 63 --------------------------------------------
 ui/nginx_config/ssl.conf     | 54 ++++++-------------------------------
 2 files changed, 8 insertions(+), 109 deletions(-)

diff --git a/ui/nginx_config/default.conf b/ui/nginx_config/default.conf
index b6126a4..90002a6 100644
--- a/ui/nginx_config/default.conf
+++ b/ui/nginx_config/default.conf
@@ -43,20 +43,6 @@ server {
     proxy_redirect off;
   }
 
-  location /streampipes-apps {
-    set $upstream app-container:3000;
-
-    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-apps/(.*)") {
-      proxy_pass  http://$upstream/$1;
-    }
-    proxy_ssl_session_reuse off;
-    proxy_set_header Host $http_host;
-    proxy_redirect off;
-  }
-
   location /streampipes-connect/ {
     set $upstream backend:8030;
 
@@ -67,55 +53,6 @@ server {
     proxy_ssl_session_reuse off;
     proxy_set_header Host $http_host;
   }
-
-  location /visualizablepipeline {
-    set $upstream couchdb:5984;
-
-    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;
-    proxy_ssl_session_reuse off;
-    proxy_set_header Host $http_host;
-    proxy_redirect off;
-  }
-
-  location /dashboard {
-    set $upstream couchdb:5984;
-    
-    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;
-    proxy_ssl_session_reuse off;
-    proxy_set_header Host $http_host;
-    proxy_redirect off;
-  }
-
-
-  location /pipeline {
-    set $upstream couchdb:5984;
-
-    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;
-    proxy_ssl_session_reuse off;
-    proxy_set_header Host $http_host;
-    proxy_redirect off;
-  }
-
-  location /swagger {
-    set $upstream swagger-ui:8080;
-
-    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;
-    proxy_ssl_session_reuse off;
-    proxy_set_header Host $http_host;
-    proxy_redirect off;
-  }
   
   location ~/endpoints/(?<endpointName>.*)$ {
     set $upstream connect-adapters-iiot:8001/api/v1/worker/live/$endpointName;
diff --git a/ui/nginx_config/ssl.conf b/ui/nginx_config/ssl.conf
index 181d348..8279fa5 100644
--- a/ui/nginx_config/ssl.conf
+++ b/ui/nginx_config/ssl.conf
@@ -63,55 +63,17 @@ server {
     proxy_set_header Host $http_host;
   }
 
-  location /visualizablepipeline {
-    set $upstream couchdb:5984;
+   location ~/endpoints/(?<endpointName>.*)$ {
+      set $upstream connect-adapters-iiot:8001/api/v1/worker/live/$endpointName;
 
-    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;
+      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;
       proxy_ssl_session_reuse off;
-    proxy_set_header Host $http_host;
-    proxy_redirect off;
-  }
-
-  location /dashboard {
-    set $upstream couchdb:5984;
-    
-    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;
-    proxy_ssl_session_reuse off;
-    proxy_set_header Host $http_host;
-    proxy_redirect off;
-  }
-
-
-  location /pipeline {
-    set $upstream couchdb:5984;
+      proxy_set_header Host $http_host;
+    }
 
-    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;
-    proxy_ssl_session_reuse off;
-    proxy_set_header Host $http_host;
-    proxy_redirect off;
-  }
-
-  location /swagger {
-    set $upstream swagger-ui:8080;
-
-    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;
-    proxy_ssl_session_reuse off;
-    proxy_set_header Host $http_host;
-    proxy_redirect off;
-  }
-  
   #error_page  404              /404.html;
 
   # redirect server error pages to the static page /50x.html