diff --git a/install.sh b/install.sh index 7beb704..8764847 100644 --- a/install.sh +++ b/install.sh @@ -1421,7 +1421,7 @@ customSSLEmail() { } # DNS API申请证书 switchDNSAPI() { - read -r -p "是否使用DNS API申请证书?[y/n]:" dnsAPIStatus + read -r -p "是否使用DNS API申请证书[支持NAT]?[y/n]:" dnsAPIStatus if [[ "${dnsAPIStatus}" == "y" ]]; then echoContent red "\n==============================================================" echoContent yellow "1.cloudflare[默认]" @@ -7542,26 +7542,6 @@ proxy-providers: interval: 300 proxy-groups: - - name: 节点选择 - type: select - use: - - ${subscribeSalt}_provider - proxies: - - 手动切换 - - 自动选择 - - 故障转移 - - 负载均衡 - - DIRECT - - name: 流媒体 - type: select - use: - - ${subscribeSalt}_provider - proxies: - - 手动切换 - - 自动选择 - - 故障转移 - - 负载均衡 - - DIRECT - name: 手动切换 type: select use: @@ -7575,23 +7555,7 @@ proxy-groups: use: - ${subscribeSalt}_provider proxies: null - - name: 故障转移 - type: fallback - url: http://www.gstatic.com/generate_204 - interval: 300 - tolerance: 50 - use: - - ${subscribeSalt}_provider - proxies: - - 自动选择 - - name: 负载均衡 - type: load-balance - url: http://www.gstatic.com/generate_204 - interval: 300 - tolerance: 50 - use: - - ${subscribeSalt}_provider - proxies: null + - name: 全球代理 type: select use: @@ -7599,13 +7563,21 @@ proxy-groups: proxies: - 手动切换 - 自动选择 + + - name: 流媒体 + type: select + use: + - ${subscribeSalt}_provider + proxies: + - 手动切换 + - 自动选择 + - DIRECT - name: DNS_Proxy type: select use: - ${subscribeSalt}_provider proxies: - 自动选择 - - 节点选择 - DIRECT - name: Telegram @@ -7615,7 +7587,14 @@ proxy-groups: proxies: - 手动切换 - 自动选择 - + - name: Google + type: select + use: + - ${subscribeSalt}_provider + proxies: + - 手动切换 + - 自动选择 + - DIRECT - name: YouTube type: select use: @@ -7629,46 +7608,7 @@ proxy-groups: - ${subscribeSalt}_provider proxies: - 流媒体 - - 节点选择 - 自动选择 - - name: HBO - type: select - use: - - ${subscribeSalt}_provider - proxies: - - 流媒体 - - 节点选择 - - 自动选择 - - name: Bing - type: select - use: - - ${subscribeSalt}_provider - proxies: - - 节点选择 - - 自动选择 - - name: OpenAI - type: select - use: - - ${subscribeSalt}_provider - proxies: - - 节点选择 - - 自动选择 - - name: Disney - type: select - use: - - ${subscribeSalt}_provider - proxies: - - 流媒体 - - 节点选择 - - 自动选择 - - name: GitHub - type: select - use: - - ${subscribeSalt}_provider - proxies: - - 手动切换 - - 自动选择 - - DIRECT - name: Spotify type: select use: @@ -7678,7 +7618,33 @@ proxy-groups: - 手动切换 - 自动选择 - DIRECT - - name: Google + - name: HBO + type: select + use: + - ${subscribeSalt}_provider + proxies: + - 流媒体 + - 自动选择 + - name: Bing + type: select + use: + - ${subscribeSalt}_provider + proxies: + - 自动选择 + - name: OpenAI + type: select + use: + - ${subscribeSalt}_provider + proxies: + - 自动选择 + - name: Disney + type: select + use: + - ${subscribeSalt}_provider + proxies: + - 流媒体 + - 自动选择 + - name: GitHub type: select use: - ${subscribeSalt}_provider @@ -7686,6 +7652,7 @@ proxy-groups: - 手动切换 - 自动选择 - DIRECT + - name: 国内媒体 type: select use: @@ -7698,7 +7665,6 @@ proxy-groups: - ${subscribeSalt}_provider proxies: - DIRECT - - 节点选择 - 自动选择 - name: 漏网之鱼 type: select @@ -7706,7 +7672,6 @@ proxy-groups: - ${subscribeSalt}_provider proxies: - DIRECT - - 节点选择 - 手动切换 - 自动选择 rule-providers: @@ -8470,14 +8435,13 @@ menu() { cd "$HOME" || exit echoContent red "\n==============================================================" echoContent green "作者:mack-a" - echoContent green "当前版本:v2.11.23" + echoContent green "当前版本:v2.11.24" echoContent green "Github:https://github.com/mack-a/v2ray-agent" echoContent green "描述:八合一共存脚本\c" showInstallStatus checkWgetShowProgress echoContent red "\n=========================== 推广区============================" echoContent red " " - echoContent green "推广请联系TG:@mackaff\n" echoContent green "VPS选购攻略:https://www.v2ray-agent.com/archives/1679975663984" echoContent green "年付10美金低价VPS AS4837:https://www.v2ray-agent.com/archives/racknerdtao-can-zheng-li-nian-fu-10mei-yuan" echoContent red "=============================================================="