From 7d9e3b927b375858d9a0454070733903a0b85a2b Mon Sep 17 00:00:00 2001
From: actions <action@github.com>
Date: Sun, 21 Apr 2024 18:30:05 +0800
Subject: [PATCH] luci-app-passwall: sync upstream

---
 .../root/etc/uci-defaults/luci-passwall       |  4 ++
 .../root/etc/uci-defaults/luci-passwall.orig  | 43 +++++++++++++++++++
 .../ucitrack/luci-app-passwall-server.json    |  4 ++
 .../usr/share/ucitrack/luci-app-passwall.json |  4 ++
 4 files changed, 55 insertions(+)
 create mode 100755 luci-app-passwall/root/etc/uci-defaults/luci-passwall.orig
 create mode 100644 luci-app-passwall/root/usr/share/ucitrack/luci-app-passwall-server.json
 create mode 100644 luci-app-passwall/root/usr/share/ucitrack/luci-app-passwall.json

diff --git a/luci-app-passwall/root/etc/uci-defaults/luci-passwall b/luci-app-passwall/root/etc/uci-defaults/luci-passwall
index fbf6ccbaf..8dedac31e 100755
--- a/luci-app-passwall/root/etc/uci-defaults/luci-passwall
+++ b/luci-app-passwall/root/etc/uci-defaults/luci-passwall
@@ -3,20 +3,24 @@
 uci -q batch <<-EOF >/dev/null
 	set dhcp.@dnsmasq[0].localuse=1
 	commit dhcp
+	[ -e "/etc/config/ucitrack" ] && {
 	delete ucitrack.@passwall[-1]
 	add ucitrack passwall
 	set ucitrack.@passwall[-1].init=passwall
 	commit ucitrack
+	}
 	delete firewall.passwall
 	set firewall.passwall=include
 	set firewall.passwall.type=script
 	set firewall.passwall.path=/var/etc/passwall.include
 	set firewall.passwall.reload=1
 	commit firewall
+	[ -e "/etc/config/ucitrack" ] && {
 	delete ucitrack.@passwall_server[-1]
 	add ucitrack passwall_server
 	set ucitrack.@passwall_server[-1].init=passwall_server
 	commit ucitrack
+	}
 	delete firewall.passwall_server
 	set firewall.passwall_server=include
 	set firewall.passwall_server.type=script
diff --git a/luci-app-passwall/root/etc/uci-defaults/luci-passwall.orig b/luci-app-passwall/root/etc/uci-defaults/luci-passwall.orig
new file mode 100755
index 000000000..2a5a32404
--- /dev/null
+++ b/luci-app-passwall/root/etc/uci-defaults/luci-passwall.orig
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	set dhcp.@dnsmasq[0].localuse=1
+	commit dhcp
+	[ -e "/etc/config/ucitrack" ] && {
+	delete ucitrack.@passwall[-1]
+	add ucitrack passwall
+	set ucitrack.@passwall[-1].init=passwall
+	commit ucitrack
+	}
+	delete firewall.passwall
+	set firewall.passwall=include
+	set firewall.passwall.type=script
+	set firewall.passwall.path=/var/etc/passwall.include
+	set firewall.passwall.reload=1
+	commit firewall
+	[ -e "/etc/config/ucitrack" ] && {
+	delete ucitrack.@passwall_server[-1]
+	add ucitrack passwall_server
+	set ucitrack.@passwall_server[-1].init=passwall_server
+	commit ucitrack
+	}
+	delete firewall.passwall_server
+	set firewall.passwall_server=include
+	set firewall.passwall_server.type=script
+	set firewall.passwall_server.path=/var/etc/passwall_server.include
+	set firewall.passwall_server.reload=1
+	commit firewall
+	set uhttpd.main.max_requests=50
+	commit uhttpd
+EOF
+
+touch /etc/config/passwall_show >/dev/null 2>&1
+[ ! -s "/etc/config/passwall" ] && cp -f /usr/share/passwall/0_default_config /etc/config/passwall
+
+chmod +x /usr/share/passwall/*.sh
+
+rm -f /tmp/luci-indexcache
+rm -rf /tmp/luci-modulecache/
+killall -HUP rpcd 2>/dev/null
+
+exit 0
diff --git a/luci-app-passwall/root/usr/share/ucitrack/luci-app-passwall-server.json b/luci-app-passwall/root/usr/share/ucitrack/luci-app-passwall-server.json
new file mode 100644
index 000000000..257e61be4
--- /dev/null
+++ b/luci-app-passwall/root/usr/share/ucitrack/luci-app-passwall-server.json
@@ -0,0 +1,4 @@
+{
+	"config": "passwall_server",
+	"init": "passwall_server"
+}
diff --git a/luci-app-passwall/root/usr/share/ucitrack/luci-app-passwall.json b/luci-app-passwall/root/usr/share/ucitrack/luci-app-passwall.json
new file mode 100644
index 000000000..b3b7140e5
--- /dev/null
+++ b/luci-app-passwall/root/usr/share/ucitrack/luci-app-passwall.json
@@ -0,0 +1,4 @@
+{
+	"config": "passwall",
+	"init": "passwall"
+}