From e7b3bd3e8ab89cd0cfbc4a6e1e39fabd19969de7 Mon Sep 17 00:00:00 2001
From: Reinder Kraaij <kraaij@astron.nl>
Date: Tue, 27 Feb 2024 23:15:22 +0000
Subject: [PATCH] Update default.conf
---
SAS/TMSS/deploy/tmss/nginx/default.conf | 31 +++++--------------------
1 file changed, 6 insertions(+), 25 deletions(-)
diff --git a/SAS/TMSS/deploy/tmss/nginx/default.conf b/SAS/TMSS/deploy/tmss/nginx/default.conf
index 6b29b8188d7..2b99f8cb818 100644
--- a/SAS/TMSS/deploy/tmss/nginx/default.conf
+++ b/SAS/TMSS/deploy/tmss/nginx/default.conf
@@ -2,6 +2,10 @@ upstream django {
server app:8001;
}
+upstream tmss_acceptance {
+ server monitor.control.lofar:9000;
+}
+
# upstream websocket {
# server websocket:5678;
# }
@@ -24,16 +28,11 @@ server {
}
location /acc/ {
- proxy_pass http://monitor.control.lofar:9000/tmss-frontend-web-acceptance/build/;
- proxy_set_header Host tmss.lofar.eu;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
try_files $uri @proxy_to_accp;
}
-
+
location @proxy_to_accp {
- proxy_pass http://monitor.control.lofar:9000/tmss-frontend-web-acceptance/build/index.html;
+ proxy_pass http://tmss_acceptance/tmss-frontend-web-acceptance/build/index.html;
proxy_set_header Host tmss.lofar.eu;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -59,24 +58,6 @@ server {
try_files $uri @proxy_to_ws;
}
-# location @proxy_to_ws {
-# proxy_pass http://websocket;
-#
-# proxy_http_version 1.1;
-# proxy_set_header Upgrade $http_upgrade;
-# proxy_set_header Connection upgrade;
-#
-# proxy_redirect off;
-# proxy_set_header Host tmss.lofar.eu;
-# proxy_set_header X-Real-IP $remote_addr;
-# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-# proxy_set_header X-Forwarded-Host $server_name;
-#
-# # disables proxy cache completely. does not go well with websockets
-# proxy_cache_bypass 1;
-# proxy_no_cache 1;
-# }
-
location /static/ {
alias /opt/lofar/staticfiles/;
}
--
GitLab