update 2026-08-14 04:36:07

luci-app-passwall2/root/etc/uci-defaults/luci-app-passwall2

@@ -5,9 +5,6 @@ if [ -e "/etc/config/ucitrack" ]; then
  		delete ucitrack.@passwall2[-1]
 		add ucitrack passwall2
 		set ucitrack.@passwall2[-1].init=passwall2
-		delete ucitrack.@passwall2_server[-1]
-		add ucitrack passwall2_server
-		set ucitrack.@passwall2_server[-1].init=passwall2_server
 		commit ucitrack
 EOF
 fi
@@ -18,11 +15,6 @@ uci -q batch <<-EOF
 	set firewall.passwall2.type='script'
 	set firewall.passwall2.path='/var/etc/passwall2.include'
 
-	delete firewall.passwall2_server
-	set firewall.passwall2_server=include
-	set firewall.passwall2_server.type='script'
-	set firewall.passwall2_server.path='/var/etc/passwall2_server.include'
-
 	set dhcp.@dnsmasq[0].localuse=1
 	commit dhcp
 
@@ -32,12 +24,9 @@ EOF
 
 if [ -x "/sbin/fw3" ]; then
 	uci -q set firewall.passwall2.reload='1'
-	uci -q set firewall.passwall2_server.reload='1'
 else
 	uci -q delete firewall.passwall2.reload
 	uci -q delete firewall.passwall2.fw4_compatible
-	uci -q delete firewall.passwall2_server.reload
-	uci -q delete firewall.passwall2_server.fw4_compatible
 fi
 uci commit firewall
 

luci-app-passwall2/root/etc/uci-defaults/luci-app-passwall2_server

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+if [ -e "/etc/config/ucitrack" ]; then
+    uci -q batch <<-EOF
+		delete ucitrack.@passwall2_server[-1]
+		add ucitrack passwall2_server
+		set ucitrack.@passwall2_server[-1].init=passwall2_server
+		commit ucitrack
+EOF
+fi
+
+uci -q batch <<-EOF
+	delete firewall.passwall2_server
+	set firewall.passwall2_server=include
+	set firewall.passwall2_server.type='script'
+	set firewall.passwall2_server.path='/var/etc/passwall2_server.include'
+EOF
+
+if [ -x "/sbin/fw3" ]; then
+	uci -q set firewall.passwall2_server.reload='1'
+else
+	uci -q delete firewall.passwall2_server.reload
+	uci -q delete firewall.passwall2_server.fw4_compatible
+fi
+uci commit firewall
+
+rm -f /tmp/luci-indexcache /tmp/luci-indexcache.*
+rm -rf /tmp/luci-modulecache/
+killall -HUP rpcd 2>/dev/null
+
+exit 0