🍉 Sync 2026-09-25 18:00:12

This commit is contained in:
github-actions[bot] committed 2026-09-25 18:00:12 +08:00
1 parent 7c17dda4d0
commit 2ee65a261e
135 files changed
+5726 -7799

No files matched your search

@@ -53,6 +53,7 @@ DAE_INIT="/etc/init.d/dae"
if [ -f "$DAE_INIT" ]; then
sed -i 's/--disable-timestamp//' "$DAE_INIT"
sed -i '/procd_append_param command *$/d' "$DAE_INIT"
sed -i 's|^[[:space:]]*"$PROG" validate -c "$config_file"| DAE_LOCATION_ASSET="/usr/share/v2ray" "$PROG" validate -c "$config_file"|' "$DAE_INIT"
sed -i 's|procd_set_param env DAE_LOCATION_ASSET="/usr/share/v2ray".*|procd_set_param env DAE_LOCATION_ASSET="/usr/share/v2ray" TZ="$(uci -q get system.@system[0].zonename)"|' "$DAE_INIT"
fi
@@ -271,6 +271,7 @@ generate() {
echo " routing {"
echo " request {"
[ "$block_ads" = "1" ] && echo " qname(geosite:category-ads-all) -> reject"
echo " qname(suffix:googleapis.cn) -> fallbackdns"
echo " qname(geosite:cn) -> cndns"
echo " fallback: fallbackdns"
echo " }"
@@ -295,6 +296,7 @@ generate() {
# OS connectivity checks direct (avoid captive-portal false positives)
echo " domain(connectivitycheck.gstatic.com) -> direct"
echo " domain(msftconnecttest.com) -> direct"
echo " domain(suffix:googleapis.cn) -> ${fallback}"
if [ "$cn_direct" = "1" ]; then
echo " dip(geoip:cn) -> direct"
echo " domain(geosite:cn) -> direct"
@@ -308,7 +310,7 @@ generate() {
# overwrite live config only if validation passes
local out
out="$("$DAE_BIN" validate -c "$TMP_GEN" 2>&1)"
out="$(DAE_LOCATION_ASSET="/usr/share/v2ray" "$DAE_BIN" validate -c "$TMP_GEN" 2>&1)"
if [ $? -ne 0 ]; then
echo "validate failed: $(echo "$out" | head -1)" >&2
rm -f "$TMP_GEN"
@@ -23,7 +23,7 @@
"/tmp/luci-app-daede.backup.log": [ "read" ],
"/bin/pidof dae": [ "exec" ],
"/bin/pidof daed": [ "exec" ],
"/usr/bin/dae validate -c /tmp/dae-validate.dae": [ "exec" ],
"/usr/bin/env DAE_LOCATION_ASSET=/usr/share/v2ray /usr/bin/dae validate -c /tmp/dae-validate.dae": [ "exec" ],
"/usr/bin/dae --version": [ "exec" ],
"/bin/rm -f /tmp/dae-validate.dae": [ "exec" ],
"/usr/share/luci-app-daede/pkg-info.sh dae": [ "exec" ],