diff --git a/install.sh b/install.sh index 890a8f4..72182e0 100644 --- a/install.sh +++ b/install.sh @@ -1691,9 +1691,9 @@ initDNSAPIConfig() { exit 0 fi read -r -p "是否使用*.${dnsTLSDomain}进行API申请通配符证书?[y/n]:" dnsAPIStatus - if [[ "${dnsAPIStatus}" != "y" ]]; then - exit 0 - fi + # if [[ "${dnsAPIStatus}" != "y" ]]; then + # exit 0 + # fi fi elif [[ "$1" == "aliyun" ]]; then # echoContent yellow "\n CF_Token参考配置教程:https://www.v2ray-agent.com/archives/1701160377972\n" @@ -1769,13 +1769,17 @@ selectAcmeInstallSSL() { # 安装SSL证书 acmeInstallSSL() { + local dnsAPIDomain="${tlsDomain}" + if [[ "${dnsAPIStatus}" == "y" ]]; then + dnsAPIDomain="*.${dnsTLSDomain}" + fi if [[ "${dnsAPIType}" == "cloudflare" ]]; then - echoContent green " ---> 生成通配符证书中" - 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 + echoContent green " ---> DNS API 生成证书中" + sudo CF_Token="${cfAPIToken}" "$HOME/.acme.sh/acme.sh" --issue -d "${dnsAPIDomain}" --dns dns_cf -k ec-256 --server "${sslType}" ${sslIPv6} 2>&1 | tee -a /etc/v2ray-agent/tls/acme.log >/dev/null elif [[ "${dnsAPIType}" == "aliyun" ]]; then - echoContent green " ---> 生成通配符证书中" - sudo Ali_Key="${aliKey}" Ali_Secret="${aliSecret}" "$HOME/.acme.sh/acme.sh" --issue -d "*.${dnsTLSDomain}" --dns dns_ali -k ec-256 --server "${sslType}" ${sslIPv6} 2>&1 | tee -a /etc/v2ray-agent/tls/acme.log >/dev/null + echoContent green " ---> DNS API 生成证书中" + sudo Ali_Key="${aliKey}" Ali_Secret="${aliSecret}" "$HOME/.acme.sh/acme.sh" --issue -d "${dnsAPIDomain}" --dns dns_ali -k ec-256 --server "${sslType}" ${sslIPv6} 2>&1 | tee -a /etc/v2ray-agent/tls/acme.log >/dev/null else echoContent green " ---> 生成证书中" 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 @@ -9425,7 +9429,7 @@ menu() { cd "$HOME" || exit echoContent red "\n==============================================================" echoContent green "作者:mack-a" - echoContent green "当前版本:v3.3.9" + echoContent green "当前版本:v3.3.10" echoContent green "Github:https://github.com/mack-a/v2ray-agent" echoContent green "描述:八合一共存脚本\c" showInstallStatus