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/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 5b4a40d..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.28" +_version="v3.29" cmd="apt-get"