diff --git a/config/client/h2.json b/config/client/h2.json index 277d286..d7a0d39 100644 --- a/config/client/h2.json +++ b/config/client/h2.json @@ -90,17 +90,24 @@ ], "dns": { "servers": [ - "1.1.1.1", - "1.0.0.1", { "address": "119.29.29.29", "port": 53, "domains": [ - "geosite:cn" + "geosite:cn" + ], + "expectIPs": [ + "geoip:cn" + ] + }, + { + "address": "1.1.1.1", + "port": 53, + "domains": [ + "geosite:geolocation-!cn" ] }, "8.8.8.8", - "8.8.4.4", "localhost" ] }, diff --git a/config/client/http.json b/config/client/http.json index f33004a..ac87af1 100644 --- a/config/client/http.json +++ b/config/client/http.json @@ -120,17 +120,24 @@ ], "dns": { "servers": [ - "1.1.1.1", - "1.0.0.1", { "address": "119.29.29.29", "port": 53, "domains": [ - "geosite:cn" + "geosite:cn" + ], + "expectIPs": [ + "geoip:cn" + ] + }, + { + "address": "1.1.1.1", + "port": 53, + "domains": [ + "geosite:geolocation-!cn" ] }, "8.8.8.8", - "8.8.4.4", "localhost" ] }, diff --git a/config/client/kcp.json b/config/client/kcp.json index 04247d0..dafda17 100644 --- a/config/client/kcp.json +++ b/config/client/kcp.json @@ -91,17 +91,24 @@ ], "dns": { "servers": [ - "1.1.1.1", - "1.0.0.1", { "address": "119.29.29.29", "port": 53, "domains": [ - "geosite:cn" + "geosite:cn" + ], + "expectIPs": [ + "geoip:cn" + ] + }, + { + "address": "1.1.1.1", + "port": 53, + "domains": [ + "geosite:geolocation-!cn" ] }, "8.8.8.8", - "8.8.4.4", "localhost" ] }, diff --git a/config/client/quic.json b/config/client/quic.json index 9877e79..01b2c06 100644 --- a/config/client/quic.json +++ b/config/client/quic.json @@ -90,17 +90,24 @@ ], "dns": { "servers": [ - "1.1.1.1", - "1.0.0.1", { "address": "119.29.29.29", "port": 53, "domains": [ - "geosite:cn" + "geosite:cn" + ], + "expectIPs": [ + "geoip:cn" + ] + }, + { + "address": "1.1.1.1", + "port": 53, + "domains": [ + "geosite:geolocation-!cn" ] }, "8.8.8.8", - "8.8.4.4", "localhost" ] }, diff --git a/config/client/tcp.json b/config/client/tcp.json index 6e7756a..687d80e 100644 --- a/config/client/tcp.json +++ b/config/client/tcp.json @@ -80,17 +80,24 @@ ], "dns": { "servers": [ - "1.1.1.1", - "1.0.0.1", { "address": "119.29.29.29", "port": 53, "domains": [ - "geosite:cn" + "geosite:cn" + ], + "expectIPs": [ + "geoip:cn" + ] + }, + { + "address": "1.1.1.1", + "port": 53, + "domains": [ + "geosite:geolocation-!cn" ] }, "8.8.8.8", - "8.8.4.4", "localhost" ] }, diff --git a/config/client/ws.json b/config/client/ws.json index 38d2e3c..108bc49 100644 --- a/config/client/ws.json +++ b/config/client/ws.json @@ -83,17 +83,24 @@ ], "dns": { "servers": [ - "1.1.1.1", - "1.0.0.1", { "address": "119.29.29.29", "port": 53, "domains": [ - "geosite:cn" + "geosite:cn" + ], + "expectIPs": [ + "geoip:cn" + ] + }, + { + "address": "1.1.1.1", + "port": 53, + "domains": [ + "geosite:geolocation-!cn" ] }, "8.8.8.8", - "8.8.4.4", "localhost" ] }, diff --git a/config/client/ws_tls.json b/config/client/ws_tls.json index f53ab58..85c1625 100644 --- a/config/client/ws_tls.json +++ b/config/client/ws_tls.json @@ -93,17 +93,24 @@ ], "dns": { "servers": [ - "1.1.1.1", - "1.0.0.1", { "address": "119.29.29.29", "port": 53, "domains": [ - "geosite:cn" + "geosite:cn" + ], + "expectIPs": [ + "geoip:cn" + ] + }, + { + "address": "1.1.1.1", + "port": 53, + "domains": [ + "geosite:geolocation-!cn" ] }, "8.8.8.8", - "8.8.4.4", "localhost" ] }, diff --git a/config/server/dynamic/http.json b/config/server/dynamic/http.json index 4661469..bf5f85d 100644 --- a/config/server/dynamic/http.json +++ b/config/server/dynamic/http.json @@ -97,18 +97,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, + }, { "protocol": "mtproto", "settings": {}, @@ -118,7 +116,8 @@ // ], "dns": { - "server": [ + "servers": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", @@ -167,9 +166,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/dynamic/kcp.json b/config/server/dynamic/kcp.json index 48e3b8b..5e8fb16 100644 --- a/config/server/dynamic/kcp.json +++ b/config/server/dynamic/kcp.json @@ -69,18 +69,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, + }, { "protocol": "mtproto", "settings": {}, @@ -90,7 +88,8 @@ // ], "dns": { - "server": [ + "servers": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", @@ -139,9 +138,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/dynamic/quic.json b/config/server/dynamic/quic.json index dad9718..73dda58 100644 --- a/config/server/dynamic/quic.json +++ b/config/server/dynamic/quic.json @@ -71,18 +71,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, + }, { "protocol": "mtproto", "settings": {}, @@ -92,7 +90,8 @@ // ], "dns": { - "server": [ + "servers": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", @@ -141,9 +140,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/dynamic/tcp.json b/config/server/dynamic/tcp.json index 7c4d90b..9a8e049 100644 --- a/config/server/dynamic/tcp.json +++ b/config/server/dynamic/tcp.json @@ -56,18 +56,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, + }, { "protocol": "mtproto", "settings": {}, @@ -77,7 +75,8 @@ // ], "dns": { - "server": [ + "servers": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", @@ -126,9 +125,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/dynamic/ws.json b/config/server/dynamic/ws.json index 51c889a..31ecee3 100644 --- a/config/server/dynamic/ws.json +++ b/config/server/dynamic/ws.json @@ -59,18 +59,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, + }, { "protocol": "mtproto", "settings": {}, @@ -80,7 +78,8 @@ // ], "dns": { - "server": [ + "servers": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", @@ -129,9 +128,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/h2.json b/config/server/h2.json index 6be2a38..fc52a20 100644 --- a/config/server/h2.json +++ b/config/server/h2.json @@ -52,18 +52,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, + }, { "protocol": "mtproto", "settings": {}, @@ -73,7 +71,8 @@ // ], "dns": { - "server": [ + "servers": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", @@ -122,9 +121,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/http.json b/config/server/http.json index 77e1a8b..666d313 100644 --- a/config/server/http.json +++ b/config/server/http.json @@ -70,18 +70,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, + }, { "protocol": "mtproto", "settings": {}, @@ -91,7 +89,8 @@ // ], "dns": { - "server": [ + "servers": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", @@ -140,9 +139,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/kcp.json b/config/server/kcp.json index bca8dad..e282d95 100644 --- a/config/server/kcp.json +++ b/config/server/kcp.json @@ -42,18 +42,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, { "protocol": "mtproto", "settings": {}, @@ -63,7 +61,8 @@ // ], "dns": { - "server": [ + "servers": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", @@ -112,9 +111,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/quic.json b/config/server/quic.json index 4da010a..61cb30b 100644 --- a/config/server/quic.json +++ b/config/server/quic.json @@ -43,18 +43,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, { "protocol": "mtproto", "settings": {}, @@ -64,7 +62,8 @@ // ], "dns": { - "server": [ + "servers": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", @@ -113,9 +112,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/tcp.json b/config/server/tcp.json index 01819bf..bfff340 100644 --- a/config/server/tcp.json +++ b/config/server/tcp.json @@ -37,18 +37,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, + }, { "protocol": "mtproto", "settings": {}, @@ -58,7 +56,8 @@ // ], "dns": { - "server": [ + "servers": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", @@ -107,9 +106,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/ws.json b/config/server/ws.json index 4a45f22..2fc7813 100644 --- a/config/server/ws.json +++ b/config/server/ws.json @@ -37,18 +37,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, + }, { "protocol": "mtproto", "settings": {}, @@ -58,7 +56,8 @@ // ], "dns": { - "server": [ + "servers": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", @@ -107,9 +106,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/src/download-v2ray.sh b/src/download-v2ray.sh index 4cc285e..5a5ed5a 100644 --- a/src/download-v2ray.sh +++ b/src/download-v2ray.sh @@ -15,9 +15,7 @@ _get_latest_version() { _download_v2ray_file() { _get_latest_version - [[ -d /tmp/v2ray ]] && rm -rf /tmp/v2ray - mkdir -p /tmp/v2ray - v2ray_tmp_file="/tmp/v2ray/v2ray.zip" + v2ray_tmp_file="/tmp/v2ray.zip" v2ray_download_link="https://github.com/v2ray/v2ray-core/releases/download/$v2ray_latest_ver/v2ray-linux-${v2ray_bit}.zip" if ! wget --no-check-certificate -O "$v2ray_tmp_file" $v2ray_download_link; then @@ -26,26 +24,15 @@ _download_v2ray_file() { " && exit 1 fi - unzip $v2ray_tmp_file -d "/tmp/v2ray/" - mkdir -p /usr/bin/v2ray - cp -f "/tmp/v2ray/v2ray" "/usr/bin/v2ray/v2ray" - chmod +x "/usr/bin/v2ray/v2ray" + unzip -o $v2ray_tmp_file -d "/usr/bin/v2ray/" + chmod +x /usr/bin/v2ray/{v2ray,v2ctl} echo "alias v2ray=$_v2ray_sh" >>/root/.bashrc - cp -f "/tmp/v2ray/v2ctl" "/usr/bin/v2ray/v2ctl" - chmod +x "/usr/bin/v2ray/v2ctl" } _install_v2ray_service() { - if [[ $systemd ]]; then - cp -f "/tmp/v2ray/systemd/v2ray.service" "/lib/systemd/system/" - sed -i "s/on-failure/always/" /lib/systemd/system/v2ray.service - systemctl enable v2ray - else - apt-get install -y daemon - cp "/tmp/v2ray/systemv/v2ray" "/etc/init.d/v2ray" - chmod +x "/etc/init.d/v2ray" - update-rc.d -f v2ray defaults - fi + cp -f "/usr/bin/v2ray/systemd/v2ray.service" "/lib/systemd/system/" + sed -i "s/on-failure/always/" /lib/systemd/system/v2ray.service + systemctl enable v2ray } _update_v2ray_version() { diff --git a/v2ray.sh b/v2ray.sh index 1420c13..aff40f1 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -10,7 +10,7 @@ none='\e[0m' # Root [[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1 -_version="v3.26" +_version="v3.29" cmd="apt-get"