zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-passwall: sync upstream

Browse Source
This commit is contained in:
actions 2024-04-21 18:30:05 +08:00
parent c72707a190
commit 7d9e3b927b
4 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
luci-app-passwall/root/etc/uci-defaults/luci-passwall
View File

@ -3,20 +3,24 @@
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set dhcp.@dnsmasq[0].localuse=1 set dhcp.@dnsmasq[0].localuse=1
commit dhcp commit dhcp
[ -e "/etc/config/ucitrack" ] && {
delete ucitrack.@passwall[-1] delete ucitrack.@passwall[-1]
add ucitrack passwall add ucitrack passwall
set ucitrack.@passwall[-1].init=passwall set ucitrack.@passwall[-1].init=passwall
commit ucitrack commit ucitrack
}
delete firewall.passwall delete firewall.passwall
set firewall.passwall=include set firewall.passwall=include
set firewall.passwall.type=script set firewall.passwall.type=script
set firewall.passwall.path=/var/etc/passwall.include set firewall.passwall.path=/var/etc/passwall.include
set firewall.passwall.reload=1 set firewall.passwall.reload=1
commit firewall commit firewall
[ -e "/etc/config/ucitrack" ] && {
delete ucitrack.@passwall_server[-1] delete ucitrack.@passwall_server[-1]
add ucitrack passwall_server add ucitrack passwall_server
set ucitrack.@passwall_server[-1].init=passwall_server set ucitrack.@passwall_server[-1].init=passwall_server
commit ucitrack commit ucitrack
}
delete firewall.passwall_server delete firewall.passwall_server
set firewall.passwall_server=include set firewall.passwall_server=include
set firewall.passwall_server.type=script set firewall.passwall_server.type=script

43
luci-app-passwall/root/etc/uci-defaults/luci-passwall.orig Executable file
View File

@ -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

4
luci-app-passwall/root/usr/share/ucitrack/luci-app-passwall-server.json Normal file
View File

@ -0,0 +1,4 @@
{
"config": "passwall_server",
"init": "passwall_server"
}

4
luci-app-passwall/root/usr/share/ucitrack/luci-app-passwall.json Normal file
View File

@ -0,0 +1,4 @@
{
"config": "passwall",
"init": "passwall"
}