diff --git a/scripts/node-info.sh b/scripts/node-info.sh index 612d4a0..e3ca385 100644 --- a/scripts/node-info.sh +++ b/scripts/node-info.sh @@ -217,7 +217,6 @@ EOF cat << EOF "tls": { - "enabled": true, EOF if [[ -n "$sni_domain" ]]; then @@ -264,17 +263,19 @@ generate_singbox_pc_config() { "servers": [ { "tag": "google", - "address": "8.8.8.8" + "type": "udp", + "server": "8.8.8.8" }, { "tag": "local", - "address": "223.5.5.5", + "type": "udp", + "server": "223.5.5.5", "detour": "direct" } ], "rules": [ { - "geosite": "cn", + "rule_set": "geosite-cn", "server": "local" } ] @@ -308,7 +309,6 @@ EOF cat << EOF "tls": { - "enabled": true, EOF if [[ -n "$sni_domain" ]]; then @@ -343,22 +343,30 @@ EOF "route": { "rules": [ { - "geoip": "cn", + "rule_set": "geoip-cn", "outbound": "direct" }, { - "geosite": "cn", + "rule_set": "geosite-cn", "outbound": "direct" } ], - "geoip": { - "download_url": "https://github.com/SagerNet/sing-geoip/releases/latest/download/geoip.db", - "download_detour": "Hysteria2-Server" - }, - "geosite": { - "download_url": "https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db", - "download_detour": "Hysteria2-Server" - }, + "rule_set": [ + { + "tag": "geoip-cn", + "type": "remote", + "format": "binary", + "url": "https://github.com/SagerNet/sing-geoip/releases/latest/download/geoip.db", + "download_detour": "Hysteria2-Server" + }, + { + "tag": "geosite-cn", + "type": "remote", + "format": "binary", + "url": "https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db", + "download_detour": "Hysteria2-Server" + } + ], "final": "Hysteria2-Server", "auto_detect_interface": true } @@ -709,17 +717,19 @@ EOF "servers": [ { "tag": "google", - "address": "8.8.8.8" + "type": "udp", + "server": "8.8.8.8" }, { "tag": "local", - "address": "223.5.5.5", + "type": "udp", + "server": "223.5.5.5", "detour": "direct" } ], "rules": [ { - "geosite": "cn", + "rule_set": "geosite-cn", "server": "local" } ] @@ -744,7 +754,6 @@ EOF cat >> "$singbox_sub" << EOF "tls": { - "enabled": true, EOF if [[ -n "$sni_domain" ]]; then @@ -779,22 +788,30 @@ EOF "route": { "rules": [ { - "geoip": "cn", + "rule_set": "geoip-cn", "outbound": "direct" }, { - "geosite": "cn", + "rule_set": "geosite-cn", "outbound": "direct" } ], - "geoip": { - "download_url": "https://github.com/SagerNet/sing-geoip/releases/latest/download/geoip.db", - "download_detour": "Hysteria2-Server" - }, - "geosite": { - "download_url": "https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db", - "download_detour": "Hysteria2-Server" - }, + "rule_set": [ + { + "tag": "geoip-cn", + "type": "remote", + "format": "binary", + "url": "https://github.com/SagerNet/sing-geoip/releases/latest/download/geoip.db", + "download_detour": "Hysteria2-Server" + }, + { + "tag": "geosite-cn", + "type": "remote", + "format": "binary", + "url": "https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db", + "download_detour": "Hysteria2-Server" + } + ], "final": "Hysteria2-Server", "auto_detect_interface": true } @@ -813,17 +830,19 @@ EOF "servers": [ { "tag": "google", - "address": "8.8.8.8" + "type": "udp", + "server": "8.8.8.8" }, { "tag": "local", - "address": "223.5.5.5", + "type": "udp", + "server": "223.5.5.5", "detour": "direct" } ], "rules": [ { - "geosite": "cn", + "rule_set": "geosite-cn", "server": "local" } ] @@ -857,7 +876,6 @@ EOF cat >> "$singbox_pc_sub" << EOF "tls": { - "enabled": true, EOF if [[ -n "$sni_domain" ]]; then @@ -892,22 +910,30 @@ EOF "route": { "rules": [ { - "geoip": "cn", + "rule_set": "geoip-cn", "outbound": "direct" }, { - "geosite": "cn", + "rule_set": "geosite-cn", "outbound": "direct" } ], - "geoip": { - "download_url": "https://github.com/SagerNet/sing-geoip/releases/latest/download/geoip.db", - "download_detour": "Hysteria2-Server" - }, - "geosite": { - "download_url": "https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db", - "download_detour": "Hysteria2-Server" - }, + "rule_set": [ + { + "tag": "geoip-cn", + "type": "remote", + "format": "binary", + "url": "https://github.com/SagerNet/sing-geoip/releases/latest/download/geoip.db", + "download_detour": "Hysteria2-Server" + }, + { + "tag": "geosite-cn", + "type": "remote", + "format": "binary", + "url": "https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db", + "download_detour": "Hysteria2-Server" + } + ], "final": "Hysteria2-Server", "auto_detect_interface": true }