Merge branch 'master' of git.astron.nl:ro/lofar

SAS/TMSS/deploy/tmss/nginx/default.conf

@@ -2,9 +2,6 @@ upstream django {
     server app:8001;
 }
 
-# upstream websocket {
-#     server websocket:5678;
-# }
 
 server {
     listen 8008;
@@ -14,9 +11,52 @@ server {
     add_header Referrer-Policy 'strict-origin';
 
    location / {
+    rewrite ^/(?!((static/)|(manifest\.json)|(favicon\.ico))).*$ /tmss-frontend-web-production/build/index.html break;
+    proxy_pass https://s3.lofar.net/tmss-frontend-web-production/build/;
+    proxy_set_header Host s3.lofar.net;
+    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;
+    proxy_pass_header Server;
+    proxy_ssl_name s3.lofar.net;
+    proxy_ssl_server_name on; 
+}
+
+    location /api/ {
+        try_files $uri @proxy_to_app;
+    }
+
+    location /oidc/ {
+        try_files $uri @proxy_to_app;
+    }
+
+    location /workflow_api/ {
+        try_files $uri @proxy_to_app;
+    }
+
+    location /admin/ {
+        try_files $uri @proxy_to_app;   
+    }
+    
+    location /schedule/ {
+        try_files $uri @proxy_to_app;   
+    }
+
+    location /schedule {
+        try_files $uri @proxy_to_app;   
+    }
+
+    location /past_schedule/ {
         try_files $uri @proxy_to_app;   
     }
 
+    location /past_schedule {
+        try_files $uri @proxy_to_app;   
+    }
+    
+    location /wss/ {
+        try_files $uri @proxy_to_app;
+    }
 
     location /nginx_status {
         stub_status on;
@@ -26,12 +66,14 @@ server {
     location /acc/ {
        rewrite ^/acc/(?!((static/)|(manifest\.json)|(favicon\.ico))).*$ /tmss-frontend-web-acceptance/build/index.html break;
 
-    proxy_pass https://s3.lofar.net//tmss-frontend-web-acceptance/build/;
-    proxy_set_header Host tmss.lofar.eu;
+       proxy_pass https://s3.lofar.net/tmss-frontend-web-acceptance/build/;
+       proxy_set_header Host s3.lofar.net;
        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;
        proxy_pass_header Server;
+       proxy_ssl_name s3.lofar.net;
+       proxy_ssl_server_name on; 
    }
 
 
@@ -54,25 +96,9 @@ location /acc/ {
         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/;
+
+    location /static/rest_framework/ {
+        alias /opt/lofar/staticfiles/rest_framework/;
     }
+ 
 }