From 4483384b8ac5cd086b86beffa1db01730847916c Mon Sep 17 00:00:00 2001 From: Tim Wilkinson Date: Sun, 27 Oct 2024 22:30:04 -0700 Subject: [PATCH] Remove setting old dmz value (#1657) * Remove setting old dmz value (missed checkin) * Fix firewall nat check --- files/usr/local/bin/mesh-firewall | 2 +- files/usr/local/bin/node-setup | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/files/usr/local/bin/mesh-firewall b/files/usr/local/bin/mesh-firewall index da8a2de0..f0e89994 100755 --- a/files/usr/local/bin/mesh-firewall +++ b/files/usr/local/bin/mesh-firewall @@ -37,7 +37,7 @@ LICENSE ### Lets export some variables to help other scripts we call later. #Are we in NAT mode -if [ "$(/sbin/uci -q get aredn.@dmz[0].mode)" != "0" ] +if [ "$(/sbin/uci -c /etc/config.mesh -q get setup.globals.dmz_mode)" != "0" ] then export MESHFW_NATLAN=0 else diff --git a/files/usr/local/bin/node-setup b/files/usr/local/bin/node-setup index 90d21eb8..faab630e 100755 --- a/files/usr/local/bin/node-setup +++ b/files/usr/local/bin/node-setup @@ -1039,11 +1039,6 @@ do end write_all("/tmp/new_config/wireless", config) --- indicate whether lan is running in dmz mode - -nc:set("aredn", "@dmz[0]", "mode", cfg.dmz_mode) -nc:commit("aredn") - -- generate the host and ethers files local h = io.open("/etc/hosts", "w") local e = io.open("/etc/ethers", "w")