From 356e2e43e69891642c2f7071965b057c46aeb278 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 18 Feb 2026 07:58:17 +0100 Subject: [PATCH] Refactor Nginx configuration for ingress handling --- .../rootfs/etc/nginx/http.d/ingress.conf | 62 ++++++++++++------- 1 file changed, 38 insertions(+), 24 deletions(-) diff --git a/netalertx/rootfs/etc/nginx/http.d/ingress.conf b/netalertx/rootfs/etc/nginx/http.d/ingress.conf index 1e8ffa792..7dfa05456 100644 --- a/netalertx/rootfs/etc/nginx/http.d/ingress.conf +++ b/netalertx/rootfs/etc/nginx/http.d/ingress.conf @@ -7,40 +7,54 @@ server { listen %%interface%%:%%port%% default_server; server_name netalertx; proxy_buffering off; + include /etc/nginx/includes/server_params.conf; include /etc/nginx/includes/proxy_params.conf; + location ~ ^/php%%ingress_entry%%/(.*)$ { + rewrite ^/php%%ingress_entry%%/(.*)$ /php/$1 break; + } + location / { proxy_pass http://127.0.0.1:20211/; + rewrite ^%%ingress_entry%%/?(.*)$ /$1 break; - sub_filter_once off; - sub_filter_types *; - sub_filter 'href="/' 'href="%%ingress_entry%%/'; - sub_filter '(?>$host)/css/' '%%ingress_entry%%/css/'; - sub_filter '(?>$host)/js/' '%%ingress_entry%%/js/'; - sub_filter '/img/' '%%ingress_entry%%/img/'; - sub_filter '/lib/' '%%ingress_entry%%/lib/'; - sub_filter '/php/' '%%ingress_entry%%/php/'; - sub_filter '"/server' '"%%ingress_entry%%/server'; - # Next three lines allow websockets - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; + sub_filter_once off; + sub_filter_types *; + + sub_filter '"/server' '"%%ingress_entry%%/server'; + sub_filter 'href="/' 'href="%%ingress_entry%%/'; + sub_filter 'src="/' 'src="%%ingress_entry%%/'; + sub_filter 'action="/' 'action="%%ingress_entry%%/'; + sub_filter '(?>$host)/css/' '%%ingress_entry%%/css/'; + sub_filter '(?>$host)/js/' '%%ingress_entry%%/js/'; + sub_filter '/img/' '%%ingress_entry%%/img/'; + sub_filter '/lib/' '%%ingress_entry%%/lib/'; + sub_filter '/php/' '%%ingress_entry%%/php/'; +# sub_filter '"/server"' '"%%ingress_entry%%/server"'; +# sub_filter "'/server'" "'%%ingress_entry%%/server'"; +# sub_filter "fetch(sseUrl" "fetch(%%ingress_entry%%sseUrl"; + + # Websocket support + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; - # Allow downloading fragments proxy_set_header Range $http_range; proxy_set_header If-Range $http_if_range; - # Improve ip handling - proxy_hide_header X-Powered-By; - 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_set_header Accept-Encoding ""; - proxy_connect_timeout 30m; - proxy_send_timeout 30m; - proxy_read_timeout 30m; - add_header X-Frame-Options "SAMEORIGIN"; + proxy_hide_header X-Powered-By; + 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_set_header Accept-Encoding ""; + + proxy_connect_timeout 30m; + proxy_send_timeout 30m; + proxy_read_timeout 30m; + + add_header X-Frame-Options "SAMEORIGIN"; } }