From c2b29b98893b65579b4c577d30561a80f39e5fb8 Mon Sep 17 00:00:00 2001
From: jkuensem <jkuensem@physik.uni-bielefeld.de>
Date: Wed, 18 Dec 2019 21:17:37 +0100
Subject: [PATCH] LEI-40: Updated routing config for serving LSMR
---
SAS/LSMR/docker/lsmr-testenv/nginx.conf | 9 +++++----
SAS/LSMR/src/lsmr/urls.py | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/SAS/LSMR/docker/lsmr-testenv/nginx.conf b/SAS/LSMR/docker/lsmr-testenv/nginx.conf
index 5f9f019accc..4c064a312fd 100644
--- a/SAS/LSMR/docker/lsmr-testenv/nginx.conf
+++ b/SAS/LSMR/docker/lsmr-testenv/nginx.conf
@@ -28,12 +28,13 @@ http {
proxy_pass http://lsmr_test:3000$uri;
}
- location /api/ {
- proxy_pass http://lsmr_test:8000/;
+ location /api {
+ rewrite ^/api(.*) /$1 break;
+ proxy_pass http://lsmr_test:8000;
}
- location /frontend/ {
- proxy_pass http://lsmr_test:3000/;
+ location /frontend {
+ proxy_pass http://lsmr_test:3000;
}
}
}
\ No newline at end of file
diff --git a/SAS/LSMR/src/lsmr/urls.py b/SAS/LSMR/src/lsmr/urls.py
index 1fc09953182..556e2c5d450 100644
--- a/SAS/LSMR/src/lsmr/urls.py
+++ b/SAS/LSMR/src/lsmr/urls.py
@@ -145,4 +145,4 @@ router.register(r'task_blueprint_C', viewsets.TaskBlueprintViewSetJSONeditorOnli
urlpatterns.extend(router.urls)
# prefix everything for proxy
-urlpatterns = [url(r'^api/', include(urlpatterns))]
\ No newline at end of file
+#urlpatterns = [url(r'^api/', include(urlpatterns))]
\ No newline at end of file
--
GitLab