mirror of https://github.com/mack-a/v2ray-agent
feat(脚本): 完善宝塔环境下安装xray-core reality
parent
73e8e99aa1
commit
833893593f
17
install.sh
17
install.sh
|
@ -557,7 +557,10 @@ checkBTPanel() {
|
||||||
ln -s "/www/server/panel/vhost/cert/${btDomain}/privkey.pem" "/etc/v2ray-agent/tls/${btDomain}.key"
|
ln -s "/www/server/panel/vhost/cert/${btDomain}/privkey.pem" "/etc/v2ray-agent/tls/${btDomain}.key"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
nginxStaticPath="/www/wwwroot/${btDomain}/"
|
nginxStaticPath="/www/wwwroot/${btDomain}/html/"
|
||||||
|
|
||||||
|
mkdir -p "/www/wwwroot/${btDomain}/html/"
|
||||||
|
|
||||||
if [[ -f "/www/wwwroot/${btDomain}/.user.ini" ]]; then
|
if [[ -f "/www/wwwroot/${btDomain}/.user.ini" ]]; then
|
||||||
chattr -i "/www/wwwroot/${btDomain}/.user.ini"
|
chattr -i "/www/wwwroot/${btDomain}/.user.ini"
|
||||||
fi
|
fi
|
||||||
|
@ -5551,6 +5554,7 @@ unInstall() {
|
||||||
menu
|
menu
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
checkBTPanel
|
||||||
echoContent yellow " ---> 脚本不会删除acme相关配置,删除请手动执行 [rm -rf /root/.acme.sh]"
|
echoContent yellow " ---> 脚本不会删除acme相关配置,删除请手动执行 [rm -rf /root/.acme.sh]"
|
||||||
handleNginx stop
|
handleNginx stop
|
||||||
if [[ -z $(pgrep -f "nginx") ]]; then
|
if [[ -z $(pgrep -f "nginx") ]]; then
|
||||||
|
@ -7723,7 +7727,9 @@ customXrayInstall() {
|
||||||
if [[ -n "${btDomain}" ]]; then
|
if [[ -n "${btDomain}" ]]; then
|
||||||
echoContent skyBlue "\n进度 3/${totalProgress} : 检测到宝塔面板/1Panel,跳过申请TLS步骤"
|
echoContent skyBlue "\n进度 3/${totalProgress} : 检测到宝塔面板/1Panel,跳过申请TLS步骤"
|
||||||
handleXray stop
|
handleXray stop
|
||||||
|
if [[ "${selectCustomInstallType}" != ",7," ]]; then
|
||||||
customPortFunction
|
customPortFunction
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
# 申请tls
|
# 申请tls
|
||||||
if [[ "${selectCustomInstallType}" != ",7," ]]; then
|
if [[ "${selectCustomInstallType}" != ",7," ]]; then
|
||||||
|
@ -8816,7 +8822,14 @@ initRealityClientServersName() {
|
||||||
if [[ "${realityServerNameCurrentDomainStatus}" == "y" ]]; then
|
if [[ "${realityServerNameCurrentDomainStatus}" == "y" ]]; then
|
||||||
realityServerName="${domain}"
|
realityServerName="${domain}"
|
||||||
if [[ "${selectCoreType}" == "1" ]]; then
|
if [[ "${selectCoreType}" == "1" ]]; then
|
||||||
|
if [[ -n "${port}" ]]; then
|
||||||
realityDomainPort="${port}"
|
realityDomainPort="${port}"
|
||||||
|
elif [[ -z "${subscribePort}" ]]; then
|
||||||
|
echo
|
||||||
|
installSubscribe
|
||||||
|
readNginxSubscribe
|
||||||
|
realityDomainPort="${subscribePort}"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "${selectCoreType}" == "2" && -z "${subscribePort}" ]]; then
|
if [[ "${selectCoreType}" == "2" && -z "${subscribePort}" ]]; then
|
||||||
|
@ -9153,7 +9166,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.2.48"
|
echoContent green "当前版本:v3.2.49"
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue