diff --git a/SAS/TMSS/deploy/tmss/nginx/default.conf b/SAS/TMSS/deploy/tmss/nginx/default.conf index 2b99f8cb818d3f640132afe6d0da9b2123fb8527..0be191b48b9c39f22bdf9d5a957528dff569e525 100644 --- a/SAS/TMSS/deploy/tmss/nginx/default.conf +++ b/SAS/TMSS/deploy/tmss/nginx/default.conf @@ -2,10 +2,6 @@ upstream django { server app:8001; } -upstream tmss_acceptance { - server monitor.control.lofar:9000; -} - # upstream websocket { # server websocket:5678; # } @@ -28,17 +24,14 @@ server { } location /acc/ { - try_files $uri @proxy_to_accp; - } - - location @proxy_to_accp { - proxy_pass http://tmss_acceptance/tmss-frontend-web-acceptance/build/index.html; + 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; } + location @proxy_to_app { proxy_pass http://django; @@ -58,6 +51,24 @@ 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/; }