github
/
v2ray-agent
mirror of https://github.com/mack-a/v2ray-agent
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(脚本): 检查是否可以访问时不再使用本地的dns解析的ip以增加兼容性

pull/534/merge
mack-a 2021-06-28 15:39:37 +08:00
parent fab97bcdd3
commit 8f9be12c3f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
install.sh
View File

@ -167,6 +167,7 @@ initVar() {
# pingIPv6 pingIPv4 # pingIPv6 pingIPv4
# pingIPv4= # pingIPv4=
pingIP=
pingIPv6= pingIPv6=
# 集成更新证书逻辑不再使用单独的脚本--RenewTLS # 集成更新证书逻辑不再使用单独的脚本--RenewTLS
@ -645,7 +646,7 @@ initTLSNginxConfig() {
# 测试nginx # 测试nginx
echoContent yellow "\n检查Nginx是否正常访问" echoContent yellow "\n检查Nginx是否正常访问"
sleep 0.5 sleep 0.5
domainResult=$(curl -s "${domain}/test" | grep fjkvymb6len) domainResult=$(curl -s "${domain}/test" --resolve "${domain}:80:${pingIP}" | grep fjkvymb6len)
if [[ -n ${domainResult} ]]; then if [[ -n ${domainResult} ]]; then
handleNginx stop handleNginx stop
echoContent green "\n ---> Nginx配置成功" echoContent green "\n ---> Nginx配置成功"
@ -725,7 +726,7 @@ EOF
# 检查ip # 检查ip
checkIP() { checkIP() {
echoContent skyBlue " ---> 检查ipv4中" echoContent skyBlue " ---> 检查ipv4中"
local pingIP=$(curl -s -H 'accept:application/dns-json' 'https://cloudflare-dns.com/dns-query?name='${domain}'&type=A' | jq -r ".Answer|.[]|select(.type==1)|.data") pingIP=$(curl -s -H 'accept:application/dns-json' 'https://cloudflare-dns.com/dns-query?name='${domain}'&type=A' | jq -r ".Answer|.[]|select(.type==1)|.data")
if [[ -z "${pingIP}" ]]; then if [[ -z "${pingIP}" ]]; then
echoContent skyBlue " ---> 检查ipv6中" echoContent skyBlue " ---> 检查ipv6中"