From 956f9aaa6116e0dec7fca7a7c0f08de848b4e1af Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Tue, 4 Jan 2022 20:44:23 +0800 Subject: [PATCH 01/10] fix bug --- config/server/dynamic/http.json | 6 ++---- config/server/dynamic/kcp.json | 6 ++---- config/server/dynamic/quic.json | 6 ++---- config/server/dynamic/tcp.json | 6 ++---- config/server/dynamic/ws.json | 6 ++---- config/server/h2.json | 6 ++---- config/server/http.json | 6 ++---- config/server/kcp.json | 6 ++---- config/server/quic.json | 6 ++---- config/server/tcp.json | 6 ++---- config/server/vless_ws.json | 6 ++---- config/server/ws.json | 6 ++---- src/download-v2ray.sh | 1 + v2ray.sh | 2 +- 14 files changed, 26 insertions(+), 49 deletions(-) diff --git a/config/server/dynamic/http.json b/config/server/dynamic/http.json index bf5f85d..f06a667 100644 --- a/config/server/dynamic/http.json +++ b/config/server/dynamic/http.json @@ -117,11 +117,9 @@ ], "dns": { "servers": [ - "https+local://1.1.1.1/dns-query", - "1.1.1.1", - "1.0.0.1", + "https+local://8.8.8.8/dns-query", "8.8.8.8", - "8.8.4.4", + "1.1.1.1", "localhost" ] }, diff --git a/config/server/dynamic/kcp.json b/config/server/dynamic/kcp.json index 5e8fb16..d72f86c 100644 --- a/config/server/dynamic/kcp.json +++ b/config/server/dynamic/kcp.json @@ -89,11 +89,9 @@ ], "dns": { "servers": [ - "https+local://1.1.1.1/dns-query", - "1.1.1.1", - "1.0.0.1", + "https+local://8.8.8.8/dns-query", "8.8.8.8", - "8.8.4.4", + "1.1.1.1", "localhost" ] }, diff --git a/config/server/dynamic/quic.json b/config/server/dynamic/quic.json index 73dda58..83e98f3 100644 --- a/config/server/dynamic/quic.json +++ b/config/server/dynamic/quic.json @@ -91,11 +91,9 @@ ], "dns": { "servers": [ - "https+local://1.1.1.1/dns-query", - "1.1.1.1", - "1.0.0.1", + "https+local://8.8.8.8/dns-query", "8.8.8.8", - "8.8.4.4", + "1.1.1.1", "localhost" ] }, diff --git a/config/server/dynamic/tcp.json b/config/server/dynamic/tcp.json index 9a8e049..d1eeca3 100644 --- a/config/server/dynamic/tcp.json +++ b/config/server/dynamic/tcp.json @@ -76,11 +76,9 @@ ], "dns": { "servers": [ - "https+local://1.1.1.1/dns-query", - "1.1.1.1", - "1.0.0.1", + "https+local://8.8.8.8/dns-query", "8.8.8.8", - "8.8.4.4", + "1.1.1.1", "localhost" ] }, diff --git a/config/server/dynamic/ws.json b/config/server/dynamic/ws.json index 31ecee3..bd99b35 100644 --- a/config/server/dynamic/ws.json +++ b/config/server/dynamic/ws.json @@ -79,11 +79,9 @@ ], "dns": { "servers": [ - "https+local://1.1.1.1/dns-query", - "1.1.1.1", - "1.0.0.1", + "https+local://8.8.8.8/dns-query", "8.8.8.8", - "8.8.4.4", + "1.1.1.1", "localhost" ] }, diff --git a/config/server/h2.json b/config/server/h2.json index fc52a20..ddadb9f 100644 --- a/config/server/h2.json +++ b/config/server/h2.json @@ -72,11 +72,9 @@ ], "dns": { "servers": [ - "https+local://1.1.1.1/dns-query", - "1.1.1.1", - "1.0.0.1", + "https+local://8.8.8.8/dns-query", "8.8.8.8", - "8.8.4.4", + "1.1.1.1", "localhost" ] }, diff --git a/config/server/http.json b/config/server/http.json index 666d313..fa4b5c4 100644 --- a/config/server/http.json +++ b/config/server/http.json @@ -90,11 +90,9 @@ ], "dns": { "servers": [ - "https+local://1.1.1.1/dns-query", - "1.1.1.1", - "1.0.0.1", + "https+local://8.8.8.8/dns-query", "8.8.8.8", - "8.8.4.4", + "1.1.1.1", "localhost" ] }, diff --git a/config/server/kcp.json b/config/server/kcp.json index e282d95..45cd3e9 100644 --- a/config/server/kcp.json +++ b/config/server/kcp.json @@ -62,11 +62,9 @@ ], "dns": { "servers": [ - "https+local://1.1.1.1/dns-query", - "1.1.1.1", - "1.0.0.1", + "https+local://8.8.8.8/dns-query", "8.8.8.8", - "8.8.4.4", + "1.1.1.1", "localhost" ] }, diff --git a/config/server/quic.json b/config/server/quic.json index 61cb30b..e0344f4 100644 --- a/config/server/quic.json +++ b/config/server/quic.json @@ -63,11 +63,9 @@ ], "dns": { "servers": [ - "https+local://1.1.1.1/dns-query", - "1.1.1.1", - "1.0.0.1", + "https+local://8.8.8.8/dns-query", "8.8.8.8", - "8.8.4.4", + "1.1.1.1", "localhost" ] }, diff --git a/config/server/tcp.json b/config/server/tcp.json index bfff340..1e36266 100644 --- a/config/server/tcp.json +++ b/config/server/tcp.json @@ -57,11 +57,9 @@ ], "dns": { "servers": [ - "https+local://1.1.1.1/dns-query", - "1.1.1.1", - "1.0.0.1", + "https+local://8.8.8.8/dns-query", "8.8.8.8", - "8.8.4.4", + "1.1.1.1", "localhost" ] }, diff --git a/config/server/vless_ws.json b/config/server/vless_ws.json index 32e0263..04da3d4 100644 --- a/config/server/vless_ws.json +++ b/config/server/vless_ws.json @@ -59,11 +59,9 @@ ], "dns": { "servers": [ - "https+local://1.1.1.1/dns-query", - "1.1.1.1", - "1.0.0.1", + "https+local://8.8.8.8/dns-query", "8.8.8.8", - "8.8.4.4", + "1.1.1.1", "localhost" ] }, diff --git a/config/server/ws.json b/config/server/ws.json index 2fc7813..c32190e 100644 --- a/config/server/ws.json +++ b/config/server/ws.json @@ -57,11 +57,9 @@ ], "dns": { "servers": [ - "https+local://1.1.1.1/dns-query", - "1.1.1.1", - "1.0.0.1", + "https+local://8.8.8.8/dns-query", "8.8.8.8", - "8.8.4.4", + "1.1.1.1", "localhost" ] }, diff --git a/src/download-v2ray.sh b/src/download-v2ray.sh index 770ccb7..1d5f58a 100644 --- a/src/download-v2ray.sh +++ b/src/download-v2ray.sh @@ -50,6 +50,7 @@ Type=simple # More discussion at https://github.com/v2ray/v2ray-core/issues/1011 User=root #User=nobody +Environment="V2RAY_VMESS_AEAD_FORCED=false" CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE NoNewPrivileges=true diff --git a/v2ray.sh b/v2ray.sh index 32af270..9a1888e 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.45" +_version="v3.46" cmd="apt-get" From ba174ff07af96e6affe071da9dda13e41d8c4326 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Sat, 8 Jan 2022 14:31:55 +0800 Subject: [PATCH 02/10] fix bug --- src/download-v2ray.sh | 2 +- v2ray.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/download-v2ray.sh b/src/download-v2ray.sh index 1d5f58a..ea531aa 100644 --- a/src/download-v2ray.sh +++ b/src/download-v2ray.sh @@ -54,7 +54,7 @@ Environment="V2RAY_VMESS_AEAD_FORCED=false" CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE NoNewPrivileges=true -ExecStart=/usr/bin/v2ray/v2ray -config /etc/v2ray/config.json +ExecStart=/usr/bin/env v2ray.vmess.aead.forced=false /usr/bin/v2ray/v2ray -config /etc/v2ray/config.json #Restart=on-failure Restart=always diff --git a/v2ray.sh b/v2ray.sh index 9a1888e..50a188d 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.46" +_version="v3.47" cmd="apt-get" From 91134794ab9750d3e7075d44ea79e9d36d4317cc Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Sat, 8 Jan 2022 14:54:03 +0800 Subject: [PATCH 03/10] fix VMessAEAD --- v2ray.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/v2ray.sh b/v2ray.sh index 50a188d..bfaac18 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.47" +_version="v3.48" cmd="apt-get" @@ -89,6 +89,14 @@ v2ray_ver="$(/usr/bin/v2ray/v2ray -version | head -n 1 | cut -d " " -f2)" systemd=true # _test=true +# fix VMessAEAD +if [ ! $(grep 'v2ray.vmess.aead.forced=false' /lib/systemd/system/v2ray.service) ]; then + systemctl disable v2ray >/dev/null 2>&1 + sed -i 's|ExecStart=|ExecStart=/usr/bin/env v2ray.vmess.aead.forced=false |' /lib/systemd/system/v2ray.service + systemctl enable v2ray >/dev/null 2>&1 + systemctl restart v2ray >/dev/null 2>&1 +fi + if [[ $v2ray_ver != v* ]]; then v2ray_ver="v$v2ray_ver" fi From f0b3f4395f6c21c2ee60ebdc01f90d43b4501c4c Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Sun, 9 Jan 2022 01:53:59 +0800 Subject: [PATCH 04/10] fix VMessAEAD --- v2ray.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/v2ray.sh b/v2ray.sh index bfaac18..3c49914 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.48" +_version="v3.49" cmd="apt-get" @@ -90,12 +90,11 @@ systemd=true # _test=true # fix VMessAEAD -if [ ! $(grep 'v2ray.vmess.aead.forced=false' /lib/systemd/system/v2ray.service) ]; then - systemctl disable v2ray >/dev/null 2>&1 +if [[ ! $(grep 'v2ray.vmess.aead.forced=false' /lib/systemd/system/v2ray.service) ]]; then sed -i 's|ExecStart=|ExecStart=/usr/bin/env v2ray.vmess.aead.forced=false |' /lib/systemd/system/v2ray.service - systemctl enable v2ray >/dev/null 2>&1 - systemctl restart v2ray >/dev/null 2>&1 -fi + systemctl daemon-reload + systemctl restart v2ray +fi if [[ $v2ray_ver != v* ]]; then v2ray_ver="v$v2ray_ver" From 79be7a13d06c08d4287d3fb9d664d446fff0ea3c Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Thu, 20 Jan 2022 20:59:16 +0800 Subject: [PATCH 05/10] fix #822 --- src/download-v2ray.sh | 4 ++-- v2ray.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/download-v2ray.sh b/src/download-v2ray.sh index ea531aa..554f792 100644 --- a/src/download-v2ray.sh +++ b/src/download-v2ray.sh @@ -51,8 +51,8 @@ Type=simple User=root #User=nobody Environment="V2RAY_VMESS_AEAD_FORCED=false" -CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE -AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE +#CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE +#AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE NoNewPrivileges=true ExecStart=/usr/bin/env v2ray.vmess.aead.forced=false /usr/bin/v2ray/v2ray -config /etc/v2ray/config.json #Restart=on-failure diff --git a/v2ray.sh b/v2ray.sh index 3c49914..7df3a91 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.49" +_version="v3.50" cmd="apt-get" From ebd4ea926f01fcbc81306bc95d48705641329873 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Sat, 5 Feb 2022 12:13:52 +0800 Subject: [PATCH 06/10] del invaild opt --- v2ray.sh | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/v2ray.sh b/v2ray.sh index 7df3a91..5db582f 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.50" +_version="v3.51" cmd="apt-get" @@ -2294,11 +2294,7 @@ other() { echo echo -e "$yellow 1. $none安装 BBR" echo - echo -e "$yellow 2. $none安装 LotServer(锐速)" - echo - echo -e "$yellow 3. $none卸载 LotServer(锐速)" - echo - read -p "$(echo -e "请选择 [${magenta}1-3$none]:")" _opt + read -p "$(echo -e "请选择 [${magenta}1$none]:")" _opt if [[ -z $_opt ]]; then error else @@ -2307,14 +2303,6 @@ other() { install_bbr break ;; - 2) - install_lotserver - break - ;; - 3) - uninstall_lotserver - break - ;; *) error ;; @@ -2335,18 +2323,6 @@ install_bbr() { [[ ! $enable_bbr ]] && bash <(curl -s -L https://github.com/teddysun/across/raw/master/bbr.sh) fi } -install_lotserver() { - # https://moeclub.org/2017/03/08/14/ - wget --no-check-certificate -qO /tmp/appex.sh "https://raw.githubusercontent.com/0oVicero0/serverSpeeder_Install/master/appex.sh" - bash /tmp/appex.sh 'install' - rm -rf /tmp/appex.sh -} -uninstall_lotserver() { - # https://moeclub.org/2017/03/08/14/ - wget --no-check-certificate -qO /tmp/appex.sh "https://raw.githubusercontent.com/0oVicero0/serverSpeeder_Install/master/appex.sh" - bash /tmp/appex.sh 'uninstall' - rm -rf /tmp/appex.sh -} update() { while :; do From 7028fbe67938ac320538fc1136615bad26e3751a Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Sun, 13 Feb 2022 14:27:53 +0800 Subject: [PATCH 07/10] use ping check domain --- v2ray.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/v2ray.sh b/v2ray.sh index 5db582f..47451aa 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.51" +_version="v3.52" cmd="apt-get" @@ -1737,9 +1737,9 @@ change_proxy_site_config() { } domain_check() { # test_domain=$(dig $new_domain +short) - # test_domain=$(ping $new_domain -c 1 -4 | grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}") + test_domain=$(ping $new_domain -c 1 -4 -W 2| grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}") # test_domain=$(wget -qO- --header='accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$new_domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1) - test_domain=$(curl -sH 'accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$new_domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1) + # test_domain=$(curl -sH 'accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$new_domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1) if [[ $test_domain != $ip ]]; then echo echo -e "$red 检测域名解析错误....$none" From 7f764401366143b23a109ee237f6203f6817a874 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Sun, 22 May 2022 15:39:25 +0800 Subject: [PATCH 08/10] update caddy.service --- src/download-caddy.sh | 57 ++++++++++++++++++++++++------------------- v2ray.sh | 2 +- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/src/download-caddy.sh b/src/download-caddy.sh index fe41a0d..0f889ec 100644 --- a/src/download-caddy.sh +++ b/src/download-caddy.sh @@ -27,43 +27,50 @@ _install_caddy_service() { # setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/caddy if [[ $systemd ]]; then - cp -f ${caddy_tmp}init/linux-systemd/caddy.service /lib/systemd/system/ + # cp -f ${caddy_tmp}init/linux-systemd/caddy.service /lib/systemd/system/ # if ! wget https://raw.githubusercontent.com/caddyserver/caddy/master/dist/init/linux-systemd/caddy.service -O /lib/systemd/system/caddy.service; then # echo -e "$red 下载 caddy.service 失败!$none" && exit 1 # fi # sed -i "s/-log-timestamps=false//g" /lib/systemd/system/caddy.service - if [[ ! $(grep "ReadWriteDirectories" /lib/systemd/system/caddy.service) ]]; then - sed -i "/ReadWritePaths/a ReadWriteDirectories=/etc/ssl/caddy" /lib/systemd/system/caddy.service - fi - sed -i "s/www-data/root/g" /lib/systemd/system/caddy.service + # if [[ ! $(grep "ReadWriteDirectories" /lib/systemd/system/caddy.service) ]]; then + # sed -i "/ReadWritePaths/a ReadWriteDirectories=/etc/ssl/caddy" /lib/systemd/system/caddy.service + # fi + # sed -i "s/www-data/root/g" /lib/systemd/system/caddy.service # sed -i "/on-abnormal/a RestartSec=3" /lib/systemd/system/caddy.service # sed -i "s/on-abnormal/always/" /lib/systemd/system/caddy.service #### 。。。。。 Warning.....Warning.......Warning........Warning...... #### 。。。。。 use root user run caddy... - # cat >/lib/systemd/system/caddy.service <<-EOF - # [Unit] - # Description=Caddy HTTP/2 web server - # Documentation=https://caddyserver.com/docs - # After=network.target - # Wants=network.target + cat >/lib/systemd/system/caddy.service <<-EOF +[Unit] +Description=Caddy HTTP/2 web server +Documentation=https://caddyserver.com/docs +After=network.target +Wants=network.target - # [Service] - # Restart=always - # RestartSec=3 - # Environment=CADDYPATH=/root/.caddy - # ExecStart=/usr/local/bin/caddy -log stdout -agree=true -conf=/etc/caddy/Caddyfile -root=/var/tmp - # ExecReload=/bin/kill -USR1 $MAINPID - # KillMode=mixed - # KillSignal=SIGQUIT - # TimeoutStopSec=5s - # LimitNOFILE=1048576 - # LimitNPROC=512 +[Service] +Restart=on-abnormal +User=root +Group=root +Environment=CADDYPATH=/etc/ssl/caddy +ExecStart=/usr/local/bin/caddy -log stdout -log-timestamps=false -agree=true -conf=/etc/caddy/Caddyfile -root=/var/tmp +ExecReload=/bin/kill -USR1 \$MAINPID +KillMode=mixed +KillSignal=SIGQUIT +TimeoutStopSec=5s +LimitNOFILE=1048576 +LimitNPROC=512 +PrivateTmp=true +PrivateDevices=false +ProtectHome=true +ProtectSystem=full +ReadWritePaths=/etc/ssl/caddy +ReadWriteDirectories=/etc/ssl/caddy - # [Install] - # WantedBy=multi-user.target - # EOF +[Install] +WantedBy=multi-user.target + EOF systemctl enable caddy else cp -f ${caddy_tmp}init/linux-sysvinit/caddy /etc/init.d/caddy diff --git a/v2ray.sh b/v2ray.sh index 47451aa..8f3b6de 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.52" +_version="v3.53" cmd="apt-get" From 9c63512887d62994e0cb71bb60dc1d8a63b9f59d Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Wed, 25 May 2022 22:19:43 +0800 Subject: [PATCH 09/10] update: caddy1 to caddy2 --- config/server/dynamic/http.json | 33 ++++++-------------------- config/server/dynamic/kcp.json | 33 ++++++-------------------- config/server/dynamic/quic.json | 33 ++++++-------------------- config/server/dynamic/tcp.json | 33 ++++++-------------------- config/server/dynamic/ws.json | 33 ++++++-------------------- config/server/h2.json | 42 ++++++--------------------------- config/server/http.json | 33 ++++++-------------------- config/server/kcp.json | 33 ++++++-------------------- config/server/quic.json | 33 ++++++-------------------- config/server/tcp.json | 33 ++++++-------------------- config/server/vless_ws.json | 33 ++++++-------------------- config/server/ws.json | 33 ++++++-------------------- src/caddy-config.sh | 37 +++++++++-------------------- src/download-caddy.sh | 26 +++++++++----------- v2ray.sh | 21 +++++++++++++++-- 15 files changed, 125 insertions(+), 364 deletions(-) diff --git a/config/server/dynamic/http.json b/config/server/dynamic/http.json index f06a667..ad88409 100644 --- a/config/server/dynamic/http.json +++ b/config/server/dynamic/http.json @@ -126,32 +126,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ - { - "type": "field", - "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10" - ], - "outboundTag": "blocked" - }, - { - "type": "field", - "inboundTag": ["tg-in"], - "outboundTag": "tg-out" - } + { + "type": "field", + "ip": [ + "geoip:private" + ], + "outboundTag": "blocked" + } //include_ban_xx //include_ban_bt //include_ban_ad diff --git a/config/server/dynamic/kcp.json b/config/server/dynamic/kcp.json index d72f86c..7117eaa 100644 --- a/config/server/dynamic/kcp.json +++ b/config/server/dynamic/kcp.json @@ -98,32 +98,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ - { - "type": "field", - "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10" - ], - "outboundTag": "blocked" - }, - { - "type": "field", - "inboundTag": ["tg-in"], - "outboundTag": "tg-out" - } + { + "type": "field", + "ip": [ + "geoip:private" + ], + "outboundTag": "blocked" + } //include_ban_xx //include_ban_bt //include_ban_ad diff --git a/config/server/dynamic/quic.json b/config/server/dynamic/quic.json index 83e98f3..0030e84 100644 --- a/config/server/dynamic/quic.json +++ b/config/server/dynamic/quic.json @@ -100,32 +100,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ - { - "type": "field", - "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10" - ], - "outboundTag": "blocked" - }, - { - "type": "field", - "inboundTag": ["tg-in"], - "outboundTag": "tg-out" - } + { + "type": "field", + "ip": [ + "geoip:private" + ], + "outboundTag": "blocked" + } //include_ban_xx //include_ban_bt //include_ban_ad diff --git a/config/server/dynamic/tcp.json b/config/server/dynamic/tcp.json index d1eeca3..b6d943e 100644 --- a/config/server/dynamic/tcp.json +++ b/config/server/dynamic/tcp.json @@ -85,32 +85,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ - { - "type": "field", - "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10" - ], - "outboundTag": "blocked" - }, - { - "type": "field", - "inboundTag": ["tg-in"], - "outboundTag": "tg-out" - } + { + "type": "field", + "ip": [ + "geoip:private" + ], + "outboundTag": "blocked" + } //include_ban_xx //include_ban_bt //include_ban_ad diff --git a/config/server/dynamic/ws.json b/config/server/dynamic/ws.json index bd99b35..a984524 100644 --- a/config/server/dynamic/ws.json +++ b/config/server/dynamic/ws.json @@ -88,32 +88,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ - { - "type": "field", - "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10" - ], - "outboundTag": "blocked" - }, - { - "type": "field", - "inboundTag": ["tg-in"], - "outboundTag": "tg-out" - } + { + "type": "field", + "ip": [ + "geoip:private" + ], + "outboundTag": "blocked" + } //include_ban_xx //include_ban_bt //include_ban_ad diff --git a/config/server/h2.json b/config/server/h2.json index ddadb9f..d754d57 100644 --- a/config/server/h2.json +++ b/config/server/h2.json @@ -24,15 +24,6 @@ "233blog.com" ], "path": "/233blog" - }, - "security": "tls", - "tlsSettings": { - "certificates": [ - { - "certificateFile": "/etc/v2ray/233boy/v2ray/config/233blog.com.cer", - "keyFile": "/etc/v2ray/233boy/v2ray/config/233blog.com.key" - } - ] } }, "sniffing": { @@ -81,32 +72,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ - { - "type": "field", - "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10" - ], - "outboundTag": "blocked" - }, - { - "type": "field", - "inboundTag": ["tg-in"], - "outboundTag": "tg-out" - } + { + "type": "field", + "ip": [ + "geoip:private" + ], + "outboundTag": "blocked" + } //include_ban_xx //include_ban_bt //include_ban_ad diff --git a/config/server/http.json b/config/server/http.json index fa4b5c4..8d6051a 100644 --- a/config/server/http.json +++ b/config/server/http.json @@ -99,32 +99,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ - { - "type": "field", - "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10" - ], - "outboundTag": "blocked" - }, - { - "type": "field", - "inboundTag": ["tg-in"], - "outboundTag": "tg-out" - } + { + "type": "field", + "ip": [ + "geoip:private" + ], + "outboundTag": "blocked" + } //include_ban_xx //include_ban_bt //include_ban_ad diff --git a/config/server/kcp.json b/config/server/kcp.json index 45cd3e9..d938f9c 100644 --- a/config/server/kcp.json +++ b/config/server/kcp.json @@ -71,32 +71,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ - { - "type": "field", - "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10" - ], - "outboundTag": "blocked" - }, - { - "type": "field", - "inboundTag": ["tg-in"], - "outboundTag": "tg-out" - } + { + "type": "field", + "ip": [ + "geoip:private" + ], + "outboundTag": "blocked" + } //include_ban_xx //include_ban_bt //include_ban_ad diff --git a/config/server/quic.json b/config/server/quic.json index e0344f4..f0e24a8 100644 --- a/config/server/quic.json +++ b/config/server/quic.json @@ -72,32 +72,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ - { - "type": "field", - "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10" - ], - "outboundTag": "blocked" - }, - { - "type": "field", - "inboundTag": ["tg-in"], - "outboundTag": "tg-out" - } + { + "type": "field", + "ip": [ + "geoip:private" + ], + "outboundTag": "blocked" + } //include_ban_xx //include_ban_bt //include_ban_ad diff --git a/config/server/tcp.json b/config/server/tcp.json index 1e36266..e7d28b3 100644 --- a/config/server/tcp.json +++ b/config/server/tcp.json @@ -66,32 +66,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ - { - "type": "field", - "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10" - ], - "outboundTag": "blocked" - }, - { - "type": "field", - "inboundTag": ["tg-in"], - "outboundTag": "tg-out" - } + { + "type": "field", + "ip": [ + "geoip:private" + ], + "outboundTag": "blocked" + } //include_ban_xx //include_ban_bt //include_ban_ad diff --git a/config/server/vless_ws.json b/config/server/vless_ws.json index 04da3d4..7169a0c 100644 --- a/config/server/vless_ws.json +++ b/config/server/vless_ws.json @@ -68,32 +68,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ - { - "type": "field", - "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10" - ], - "outboundTag": "blocked" - }, - { - "type": "field", - "inboundTag": ["tg-in"], - "outboundTag": "tg-out" - } + { + "type": "field", + "ip": [ + "geoip:private" + ], + "outboundTag": "blocked" + } //include_ban_xx //include_ban_bt //include_ban_ad diff --git a/config/server/ws.json b/config/server/ws.json index c32190e..788b8fe 100644 --- a/config/server/ws.json +++ b/config/server/ws.json @@ -66,32 +66,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ - { - "type": "field", - "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10" - ], - "outboundTag": "blocked" - }, - { - "type": "field", - "inboundTag": ["tg-in"], - "outboundTag": "tg-out" - } + { + "type": "field", + "ip": [ + "geoip:private" + ], + "outboundTag": "blocked" + } //include_ban_xx //include_ban_bt //include_ban_ad diff --git a/src/caddy-config.sh b/src/caddy-config.sh index b7ed92b..77392a4 100644 --- a/src/caddy-config.sh +++ b/src/caddy-config.sh @@ -5,14 +5,12 @@ case $v2ray_transport in if [[ $is_path ]]; then cat >/etc/caddy/Caddyfile <<-EOF $domain { - gzip - timeouts none - proxy / $proxy_site { - except /${path} + reverse_proxy $proxy_site { + header_up Host {upstream_hostport} + header_up X-Forwarded-Host {host} } - proxy /${path} 127.0.0.1:${v2ray_port} { - without /${path} - websocket + handle_path /${path} { + reverse_proxy 127.0.0.1:${v2ray_port} } } import sites/* @@ -20,10 +18,7 @@ import sites/* else cat >/etc/caddy/Caddyfile <<-EOF $domain { - timeouts none - proxy / 127.0.0.1:${v2ray_port} { - websocket - } + reverse_proxy 127.0.0.1:${v2ray_port} } import sites/* EOF @@ -33,28 +28,18 @@ import sites/* if [[ $is_path ]]; then cat >/etc/caddy/Caddyfile <<-EOF $domain { - gzip - timeouts none - proxy / $proxy_site { - except /${path} - } - proxy /${path} https://127.0.0.1:${v2ray_port} { - header_upstream Host {host} - header_upstream X-Forwarded-Proto {scheme} - insecure_skip_verify + reverse_proxy $proxy_site { + header_up Host {upstream_hostport} + header_up X-Forwarded-Host {host} } + reverse_proxy /${path} h2c://127.0.0.1:${v2ray_port} } import sites/* EOF else cat >/etc/caddy/Caddyfile <<-EOF $domain { - timeouts none - proxy / https://127.0.0.1:${v2ray_port} { - header_upstream Host {host} - header_upstream X-Forwarded-Proto {scheme} - insecure_skip_verify - } + reverse_proxy h2c://127.0.0.1:${v2ray_port} } import sites/* EOF diff --git a/src/download-caddy.sh b/src/download-caddy.sh index 0f889ec..dd20bb4 100644 --- a/src/download-caddy.sh +++ b/src/download-caddy.sh @@ -6,7 +6,8 @@ _download_caddy_file() { echo -e "$red 获取 Caddy 下载参数失败!$none" && exit 1 fi # local caddy_download_link="https://caddyserver.com/download/linux/${caddy_arch}?license=personal" - local caddy_download_link="https://github.com/caddyserver/caddy/releases/download/v1.0.4/caddy_v1.0.4_linux_${caddy_arch}.tar.gz" + # local caddy_download_link="https://github.com/caddyserver/caddy/releases/download/v1.0.4/caddy_v1.0.4_linux_${caddy_arch}.tar.gz" + local caddy_download_link="https://github.com/caddyserver/caddy/releases/download/v2.5.1/caddy_2.5.1_linux_${caddy_arch}.tar.gz" mkdir -p $caddy_tmp @@ -43,30 +44,25 @@ _install_caddy_service() { #### 。。。。。 use root user run caddy... cat >/lib/systemd/system/caddy.service <<-EOF +#https://github.com/caddyserver/dist/blob/master/init/caddy.service [Unit] -Description=Caddy HTTP/2 web server -Documentation=https://caddyserver.com/docs -After=network.target -Wants=network.target +Description=Caddy +Documentation=https://caddyserver.com/docs/ +After=network.target network-online.target +Requires=network-online.target [Service] -Restart=on-abnormal +Type=notify User=root Group=root -Environment=CADDYPATH=/etc/ssl/caddy -ExecStart=/usr/local/bin/caddy -log stdout -log-timestamps=false -agree=true -conf=/etc/caddy/Caddyfile -root=/var/tmp -ExecReload=/bin/kill -USR1 \$MAINPID -KillMode=mixed -KillSignal=SIGQUIT +ExecStart=/usr/local/bin/caddy run --environ --config /etc/caddy/Caddyfile +ExecReload=/usr/local/bin/caddy reload --config /etc/caddy/Caddyfile TimeoutStopSec=5s LimitNOFILE=1048576 LimitNPROC=512 PrivateTmp=true -PrivateDevices=false -ProtectHome=true ProtectSystem=full -ReadWritePaths=/etc/ssl/caddy -ReadWriteDirectories=/etc/ssl/caddy +#AmbientCapabilities=CAP_NET_BIND_SERVICE [Install] WantedBy=multi-user.target diff --git a/v2ray.sh b/v2ray.sh index 8f3b6de..f585fd8 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.53" +_version="v3.54" cmd="apt-get" @@ -96,6 +96,23 @@ if [[ ! $(grep 'v2ray.vmess.aead.forced=false' /lib/systemd/system/v2ray.service systemctl restart v2ray fi +# fix caddy2 config +if [[ $caddy ]]; then + /usr/local/bin/caddy version >/dev/null 2>&1 + if [[ $? == 1 ]]; then + echo -e "\n $yellow 警告: 脚本将自动更新 Caddy 版本。 $none \n" + systemctl stop caddy + _load download-caddy.sh + _download_caddy_file + _install_caddy_service + systemctl daemon-reload + _load caddy-config.sh + systemctl restart caddy + echo -e "\n $green 更新 Caddy 版本完成, 要是出问题了你可以重装解决。 $none \n" + exit 0 + fi +fi + if [[ $v2ray_ver != v* ]]; then v2ray_ver="v$v2ray_ver" fi @@ -1737,7 +1754,7 @@ change_proxy_site_config() { } domain_check() { # test_domain=$(dig $new_domain +short) - test_domain=$(ping $new_domain -c 1 -4 -W 2| grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}") + test_domain=$(ping $new_domain -c 1 -4 -W 2 | grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}") # test_domain=$(wget -qO- --header='accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$new_domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1) # test_domain=$(curl -sH 'accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$new_domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1) if [[ $test_domain != $ip ]]; then From 39193def31780087caa3c979c9eff9967332f3a8 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Thu, 26 May 2022 13:34:30 +0800 Subject: [PATCH 10/10] fix: dns 8888 to dns.google --- config/server/dynamic/http.json | 9 ++------- config/server/dynamic/kcp.json | 9 ++------- config/server/dynamic/quic.json | 9 ++------- config/server/dynamic/tcp.json | 9 ++------- config/server/dynamic/ws.json | 9 ++------- config/server/h2.json | 9 ++------- config/server/http.json | 7 +------ config/server/kcp.json | 9 ++------- config/server/quic.json | 9 ++------- config/server/tcp.json | 9 ++------- config/server/vless_ws.json | 9 ++------- config/server/ws.json | 9 ++------- v2ray.sh | 2 +- 13 files changed, 24 insertions(+), 84 deletions(-) diff --git a/config/server/dynamic/http.json b/config/server/dynamic/http.json index ad88409..b1815ba 100644 --- a/config/server/dynamic/http.json +++ b/config/server/dynamic/http.json @@ -106,18 +106,13 @@ "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "mtproto", - "settings": {}, - "tag": "tg-out" - } + } //include_out_config // ], "dns": { "servers": [ - "https+local://8.8.8.8/dns-query", + "https+local://dns.google/dns-query", "8.8.8.8", "1.1.1.1", "localhost" diff --git a/config/server/dynamic/kcp.json b/config/server/dynamic/kcp.json index 7117eaa..461fc90 100644 --- a/config/server/dynamic/kcp.json +++ b/config/server/dynamic/kcp.json @@ -78,18 +78,13 @@ "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "mtproto", - "settings": {}, - "tag": "tg-out" - } + } //include_out_config // ], "dns": { "servers": [ - "https+local://8.8.8.8/dns-query", + "https+local://dns.google/dns-query", "8.8.8.8", "1.1.1.1", "localhost" diff --git a/config/server/dynamic/quic.json b/config/server/dynamic/quic.json index 0030e84..90a7d26 100644 --- a/config/server/dynamic/quic.json +++ b/config/server/dynamic/quic.json @@ -80,18 +80,13 @@ "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "mtproto", - "settings": {}, - "tag": "tg-out" - } + } //include_out_config // ], "dns": { "servers": [ - "https+local://8.8.8.8/dns-query", + "https+local://dns.google/dns-query", "8.8.8.8", "1.1.1.1", "localhost" diff --git a/config/server/dynamic/tcp.json b/config/server/dynamic/tcp.json index b6d943e..c3b8935 100644 --- a/config/server/dynamic/tcp.json +++ b/config/server/dynamic/tcp.json @@ -65,18 +65,13 @@ "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "mtproto", - "settings": {}, - "tag": "tg-out" - } + } //include_out_config // ], "dns": { "servers": [ - "https+local://8.8.8.8/dns-query", + "https+local://dns.google/dns-query", "8.8.8.8", "1.1.1.1", "localhost" diff --git a/config/server/dynamic/ws.json b/config/server/dynamic/ws.json index a984524..c984053 100644 --- a/config/server/dynamic/ws.json +++ b/config/server/dynamic/ws.json @@ -68,18 +68,13 @@ "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "mtproto", - "settings": {}, - "tag": "tg-out" - } + } //include_out_config // ], "dns": { "servers": [ - "https+local://8.8.8.8/dns-query", + "https+local://dns.google/dns-query", "8.8.8.8", "1.1.1.1", "localhost" diff --git a/config/server/h2.json b/config/server/h2.json index d754d57..c51996c 100644 --- a/config/server/h2.json +++ b/config/server/h2.json @@ -52,18 +52,13 @@ "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "mtproto", - "settings": {}, - "tag": "tg-out" - } + } //include_out_config // ], "dns": { "servers": [ - "https+local://8.8.8.8/dns-query", + "https+local://dns.google/dns-query", "8.8.8.8", "1.1.1.1", "localhost" diff --git a/config/server/http.json b/config/server/http.json index 8d6051a..7056cb5 100644 --- a/config/server/http.json +++ b/config/server/http.json @@ -79,12 +79,7 @@ "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "mtproto", - "settings": {}, - "tag": "tg-out" - } + } //include_out_config // ], diff --git a/config/server/kcp.json b/config/server/kcp.json index d938f9c..891d0eb 100644 --- a/config/server/kcp.json +++ b/config/server/kcp.json @@ -51,18 +51,13 @@ "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "mtproto", - "settings": {}, - "tag": "tg-out" - } + } //include_out_config // ], "dns": { "servers": [ - "https+local://8.8.8.8/dns-query", + "https+local://dns.google/dns-query", "8.8.8.8", "1.1.1.1", "localhost" diff --git a/config/server/quic.json b/config/server/quic.json index f0e24a8..0dcde7f 100644 --- a/config/server/quic.json +++ b/config/server/quic.json @@ -52,18 +52,13 @@ "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "mtproto", - "settings": {}, - "tag": "tg-out" - } + } //include_out_config // ], "dns": { "servers": [ - "https+local://8.8.8.8/dns-query", + "https+local://dns.google/dns-query", "8.8.8.8", "1.1.1.1", "localhost" diff --git a/config/server/tcp.json b/config/server/tcp.json index e7d28b3..58b06b9 100644 --- a/config/server/tcp.json +++ b/config/server/tcp.json @@ -46,18 +46,13 @@ "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "mtproto", - "settings": {}, - "tag": "tg-out" - } + } //include_out_config // ], "dns": { "servers": [ - "https+local://8.8.8.8/dns-query", + "https+local://dns.google/dns-query", "8.8.8.8", "1.1.1.1", "localhost" diff --git a/config/server/vless_ws.json b/config/server/vless_ws.json index 7169a0c..175ed09 100644 --- a/config/server/vless_ws.json +++ b/config/server/vless_ws.json @@ -48,18 +48,13 @@ "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "mtproto", - "settings": {}, - "tag": "tg-out" - } + } //include_out_config // ], "dns": { "servers": [ - "https+local://8.8.8.8/dns-query", + "https+local://dns.google/dns-query", "8.8.8.8", "1.1.1.1", "localhost" diff --git a/config/server/ws.json b/config/server/ws.json index 788b8fe..3058435 100644 --- a/config/server/ws.json +++ b/config/server/ws.json @@ -46,18 +46,13 @@ "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "mtproto", - "settings": {}, - "tag": "tg-out" - } + } //include_out_config // ], "dns": { "servers": [ - "https+local://8.8.8.8/dns-query", + "https+local://dns.google/dns-query", "8.8.8.8", "1.1.1.1", "localhost" diff --git a/v2ray.sh b/v2ray.sh index f585fd8..2608381 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.54" +_version="v3.55" cmd="apt-get"