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

fix(脚本): 修复IPv6机器无法申请证书问题、修复socks5查看配置报错问题

pull/909/head^2
mack-a 2024-01-12 23:55:33 +08:00
parent 955b8218cf
commit de908b1fed
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
install.sh
View File

@ -1556,10 +1556,15 @@ switchSSLType() {
# 选择acme安装证书方式 # 选择acme安装证书方式
selectAcmeInstallSSL() { selectAcmeInstallSSL() {
local installSSLIPv6= local sslIPv6=
local currentIPType=
currentIPType=$(curl -s -4 http://www.cloudflare.com/cdn-cgi/trace | grep "ip" | cut -d "=" -f 2)
if echo "${localIP}" | grep -q ":"; then if [[ -z "${currentIPType}" ]]; then
installSSLIPv6="--listen-v6" currentIPType=$(curl -s -6 http://www.cloudflare.com/cdn-cgi/trace | grep "ip" | cut -d "=" -f 2)
if [[ -n "${currentIPType}" ]]; then
sslIPv6="--listen-v6"
fi
fi fi
acmeInstallSSL acmeInstallSSL
@ -1571,10 +1576,10 @@ selectAcmeInstallSSL() {
acmeInstallSSL() { acmeInstallSSL() {
if [[ -n "${dnsAPIType}" ]]; then if [[ -n "${dnsAPIType}" ]]; then
echoContent green " ---> 生成通配符证书中" echoContent green " ---> 生成通配符证书中"
sudo CF_Token="${cfAPIToken}" "$HOME/.acme.sh/acme.sh" --issue -d "*.${dnsTLSDomain}" --dns dns_cf -k ec-256 --server "${sslType}" ${installSSLIPv6} 2>&1 | tee -a /etc/v2ray-agent/tls/acme.log >/dev/null sudo CF_Token="${cfAPIToken}" "$HOME/.acme.sh/acme.sh" --issue -d "*.${dnsTLSDomain}" --dns dns_cf -k ec-256 --server "${sslType}" ${sslIPv6} 2>&1 | tee -a /etc/v2ray-agent/tls/acme.log >/dev/null
else else
echoContent green " ---> 生成证书中" echoContent green " ---> 生成证书中"
sudo "$HOME/.acme.sh/acme.sh" --issue -d "${tlsDomain}" --standalone -k ec-256 --server "${sslType}" ${installSSLIPv6} 2>&1 | tee -a /etc/v2ray-agent/tls/acme.log >/dev/null sudo "$HOME/.acme.sh/acme.sh" --issue -d "${tlsDomain}" --standalone -k ec-256 --server "${sslType}" ${sslIPv6} 2>&1 | tee -a /etc/v2ray-agent/tls/acme.log >/dev/null
fi fi
} }
# 自定义端口 # 自定义端口
@ -6599,7 +6604,7 @@ socks5InboundRoutingMenu() {
echoContent yellow "\n ---> 下列内容需要配置到其他机器的出站，请不要进行代理行为\n" echoContent yellow "\n ---> 下列内容需要配置到其他机器的出站，请不要进行代理行为\n"
echoContent green " 端口：$(jq .inbounds[0].listen_port ${singBoxConfigPath}20_socks5_inbounds.json)" echoContent green " 端口：$(jq .inbounds[0].listen_port ${singBoxConfigPath}20_socks5_inbounds.json)"
echoContent green " 用户名称：$(jq -r .inbounds[0].users[0].username ${singBoxConfigPath}20_socks5_inbounds.json)" echoContent green " 用户名称：$(jq -r .inbounds[0].users[0].username ${singBoxConfigPath}20_socks5_inbounds.json)"
echoContent green " 用户密码：$(jq -r.inbounds[0].users[0].password ${singBoxConfigPath}20_socks5_inbounds.json)" echoContent green " 用户密码：$(jq -r .inbounds[0].users[0].password ${singBoxConfigPath}20_socks5_inbounds.json)"
else else
echoContent red " ---> 未安装相应功能" echoContent red " ---> 未安装相应功能"
socks5InboundRoutingMenu socks5InboundRoutingMenu
@ -8828,7 +8833,7 @@ menu() {
cd "$HOME" || exit cd "$HOME" || exit
echoContent red "\n==============================================================" echoContent red "\n=============================================================="
echoContent green "作者：mack-a" echoContent green "作者：mack-a"
echoContent green "当前版本：v3.1.30" echoContent green "当前版本：v3.1.31"
echoContent green "Github：https://github.com/mack-a/v2ray-agent" echoContent green "Github：https://github.com/mack-a/v2ray-agent"
echoContent green "描述：八合一共存脚本\c" echoContent green "描述：八合一共存脚本\c"
showInstallStatus showInstallStatus