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

luci-app-passwall: sync upstream

Browse Source 
last commit: e97f9f8b75
This commit is contained in:
actions 2024-05-08 10:30:04 +08:00
parent 0a00f0d5c5
commit 3ea3adb8e6
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,8 +35,14 @@ EOF
chmod +x /usr/share/passwall/*.sh chmod +x /usr/share/passwall/*.sh
## 4.77-5 below upgrade to 4.77-6 above
[ -e "/etc/config/passwall_show" ] && rm -rf /etc/config/passwall_show [ -e "/etc/config/passwall_show" ] && rm -rf /etc/config/passwall_show
[ "$(uci -q get passwall.@global_xray[0].sniffing)" == "1" ] && [ "$(uci -q get passwall.@global_xray[0].route_only)" != "1" ] && uci -q set passwall.@global_xray[0].sniffing_override_dest=1
uci -q delete passwall.@global_xray[0].sniffing
uci -q delete passwall.@global_xray[0].route_only
uci -q commit passwall
rm -f /tmp/luci-indexcache rm -f /tmp/luci-indexcache
rm -rf /tmp/luci-modulecache/ rm -rf /tmp/luci-modulecache/
killall -HUP rpcd 2>/dev/null killall -HUP rpcd 2>/dev/null

3
luci-app-passwall/root/usr/share/passwall/0_default_config
View File

@ -47,8 +47,7 @@ config global_forwarding
option ipv6_tproxy '0' option ipv6_tproxy '0'
config global_xray config global_xray
option sniffing '1' option sniffing_override_dest '0'
option route_only '0'
config global_singbox config global_singbox
option sniff_override_destination '0' option sniff_override_destination '0'

2
patch-luci-app-passwall.patch
View File

@ -403,7 +403,7 @@ index 24662de..77b6a0b 100644
</div> </div>
</div> </div>
diff --git a/luci-app-passwall/root/usr/share/passwall/0_default_config b/luci-app-passwall/root/usr/share/passwall/0_default_config diff --git a/luci-app-passwall/root/usr/share/passwall/0_default_config b/luci-app-passwall/root/usr/share/passwall/0_default_config
index cfe606d..1601d03 100644 index 3ac47fb..ed96a2f 100644
--- a/luci-app-passwall/root/usr/share/passwall/0_default_config --- a/luci-app-passwall/root/usr/share/passwall/0_default_config
+++ b/luci-app-passwall/root/usr/share/passwall/0_default_config +++ b/luci-app-passwall/root/usr/share/passwall/0_default_config
@@ -32,7 +32,7 @@ config global_haproxy @@ -32,7 +32,7 @@ config global_haproxy