From 4748c154241e5459845e04ebe017e84102015fef Mon Sep 17 00:00:00 2001 From: th33xitus Date: Wed, 20 Jan 2021 15:00:12 +0100 Subject: [PATCH] fix: update UI nginx configs --- resources/fluidd_nginx.cfg | 40 ++++++------------------------------ resources/mainsail_nginx.cfg | 40 ++++++------------------------------ 2 files changed, 12 insertions(+), 68 deletions(-) diff --git a/resources/fluidd_nginx.cfg b/resources/fluidd_nginx.cfg index 36adf37..bbcd70a 100644 --- a/resources/fluidd_nginx.cfg +++ b/resources/fluidd_nginx.cfg @@ -23,35 +23,15 @@ server { index index.html; server_name _; - #max upload size for gcodes - client_max_body_size 200M; + #disable max upload size + client_max_body_size 0; location / { try_files $uri $uri/ /index.html; } - location /printer { - proxy_pass http://apiserver/printer; - 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-Scheme $scheme; - } - - location /api { - proxy_pass http://apiserver/api; - 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-Scheme $scheme; - } - - location /access { - proxy_pass http://apiserver/access; - 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-Scheme $scheme; + location = /index.html { + add_header Cache-Control "no-store, no-cache, must-revalidate"; } location /websocket { @@ -65,16 +45,8 @@ server { proxy_read_timeout 86400; } - location /machine { - proxy_pass http://apiserver/machine; - 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-Scheme $scheme; - } - - location /server { - proxy_pass http://apiserver/server; + location ~ ^/(printer|api|access|machine|server)/ { + proxy_pass http://apiserver$request_uri; 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; diff --git a/resources/mainsail_nginx.cfg b/resources/mainsail_nginx.cfg index 4a3e93f..53c97be 100644 --- a/resources/mainsail_nginx.cfg +++ b/resources/mainsail_nginx.cfg @@ -23,35 +23,15 @@ server { index index.html; server_name _; - #max upload size for gcodes - client_max_body_size 200M; + #disable max upload size + client_max_body_size 0; location / { try_files $uri $uri/ /index.html; } - location /printer { - proxy_pass http://apiserver/printer; - 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-Scheme $scheme; - } - - location /api { - proxy_pass http://apiserver/api; - 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-Scheme $scheme; - } - - location /access { - proxy_pass http://apiserver/access; - 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-Scheme $scheme; + location = /index.html { + add_header Cache-Control "no-store, no-cache, must-revalidate"; } location /websocket { @@ -65,16 +45,8 @@ server { proxy_read_timeout 86400; } - location /machine { - proxy_pass http://apiserver/machine; - 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-Scheme $scheme; - } - - location /server { - proxy_pass http://apiserver/server; + location ~ ^/(printer|api|access|machine|server)/ { + proxy_pass http://apiserver$request_uri; 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;