修复不签HTTPS会退出脚本的问题

This commit is contained in:
wangbo 2026-03-22 21:55:28 +08:00
parent e2326e50c9
commit d5fa673b4e

View File

@ -88,12 +88,18 @@ run_deploy_questions() {
if [ "$DEPLOY_MODE" = "ip" ]; then if [ "$DEPLOY_MODE" = "ip" ]; then
# 2. 输入服务器 IP # 2. 输入服务器 IP
prompt_or_env DEPLOY_IP "2. 请输入服务器 IP 地址" "DEPLOY_IP" "" prompt_or_env DEPLOY_IP "2. 请输入服务器 IP 地址" "DEPLOY_IP" ""
[ -z "$DEPLOY_IP" ] && { echo "❌ IP 不能为空"; exit 1; } if [ -z "$DEPLOY_IP" ]; then
echo "❌ IP 不能为空"
exit 1
fi
echo " 请确保防火墙已放行 3001、3002、3003 端口" echo " 请确保防火墙已放行 3001、3002、3003 端口"
else else
# 3. 输入域名 # 3. 输入域名
prompt_or_env DEPLOY_DOMAIN "3. 请输入域名(不含 https:// 前缀,如 51easyai.com" "DEPLOY_DOMAIN" "" prompt_or_env DEPLOY_DOMAIN "3. 请输入域名(不含 https:// 前缀,如 51easyai.com" "DEPLOY_DOMAIN" ""
[ -z "$DEPLOY_DOMAIN" ] && { echo "❌ 域名不能为空"; exit 1; } if [ -z "$DEPLOY_DOMAIN" ]; then
echo "❌ 域名不能为空"
exit 1
fi
# 3.1 是否启用 HTTPS # 3.1 是否启用 HTTPS
if [ -n "$DEPLOY_HTTPS_INPUT" ]; then if [ -n "$DEPLOY_HTTPS_INPUT" ]; then
@ -105,7 +111,9 @@ run_deploy_questions() {
DEPLOY_HTTPS=true DEPLOY_HTTPS=true
fi fi
fi fi
[ "$DEPLOY_HTTPS" = true ] && echo " 启用 HTTPS 需确保防火墙已放行 80、443 端口" if [ "$DEPLOY_HTTPS" = true ]; then
echo " 启用 HTTPS 需确保防火墙已放行 80、443 端口"
fi
fi fi
} }
@ -115,9 +123,18 @@ setup_env_files() {
echo "📝 配置环境文件..." echo "📝 配置环境文件..."
# 6. 复制 .env.tools、.env.ASG、.env.AMS无 example 后缀的从 .sample 生成) # 6. 复制 .env.tools、.env.ASG、.env.AMS无 example 后缀的从 .sample 生成)
[ ! -f .env.tools ] && cp .env.tools.sample .env.tools && echo " ✓ .env.tools" if [ ! -f .env.tools ]; then
[ ! -f .env.ASG ] && cp .env.ASG.sample .env.ASG && echo " ✓ .env.ASG" cp .env.tools.sample .env.tools
[ ! -f .env.AMS ] && cp .env.AMS.sample .env.AMS && echo " ✓ .env.AMS" echo " ✓ .env.tools"
fi
if [ ! -f .env.ASG ]; then
cp .env.ASG.sample .env.ASG
echo " ✓ .env.ASG"
fi
if [ ! -f .env.AMS ]; then
cp .env.AMS.sample .env.AMS
echo " ✓ .env.AMS"
fi
# 4/5. 配置 .env # 4/5. 配置 .env
if [ ! -f .env ]; then if [ ! -f .env ]; then
@ -167,7 +184,9 @@ install_docker() {
fi fi
OS_VERSION_ID=$(grep -oP '(?<=^VERSION_ID=")[0-9.]+' /etc/os-release 2>/dev/null | cut -d'.' -f1 || echo "0") OS_VERSION_ID=$(grep -oP '(?<=^VERSION_ID=")[0-9.]+' /etc/os-release 2>/dev/null | cut -d'.' -f1 || echo "0")
OS_CODENAME="" OS_CODENAME=""
[[ "$OS_FAMILY" == "Ubuntu" ]] && OS_CODENAME=$(lsb_release -cs 2>/dev/null || (grep VERSION_CODENAME /etc/os-release 2>/dev/null | cut -d= -f2 | tr -d '"')) if [[ "$OS_FAMILY" == "Ubuntu" ]]; then
OS_CODENAME=$(lsb_release -cs 2>/dev/null || (grep VERSION_CODENAME /etc/os-release 2>/dev/null | cut -d= -f2 | tr -d '"'))
fi
UBUNTU_DOCKER_MIRROR_URL="https://mirrors.ustc.edu.cn/docker-ce" UBUNTU_DOCKER_MIRROR_URL="https://mirrors.ustc.edu.cn/docker-ce"
UBUNTU_DOCKER_GPG_URL="https://mirrors.ustc.edu.cn/docker-ce/linux/ubuntu/gpg" UBUNTU_DOCKER_GPG_URL="https://mirrors.ustc.edu.cn/docker-ce/linux/ubuntu/gpg"
@ -269,9 +288,15 @@ main() {
if [ "$DEPLOY_MODE" != "skip" ]; then if [ "$DEPLOY_MODE" != "skip" ]; then
setup_env_files setup_env_files
else else
[ ! -f .env.tools ] && cp .env.tools.sample .env.tools if [ ! -f .env.tools ]; then
[ ! -f .env.ASG ] && cp .env.ASG.sample .env.ASG cp .env.tools.sample .env.tools
[ ! -f .env.AMS ] && cp .env.AMS.sample .env.AMS fi
if [ ! -f .env.ASG ]; then
cp .env.ASG.sample .env.ASG
fi
if [ ! -f .env.AMS ]; then
cp .env.AMS.sample .env.AMS
fi
fi fi
if [ "$DEPLOY_DRY_RUN" = "1" ]; then if [ "$DEPLOY_DRY_RUN" = "1" ]; then
@ -292,7 +317,9 @@ main() {
echo "访问地址: http://${DEPLOY_IP}:3010" echo "访问地址: http://${DEPLOY_IP}:3010"
elif [ "$DEPLOY_MODE" = "domain" ] && [ -n "$DEPLOY_DOMAIN" ]; then elif [ "$DEPLOY_MODE" = "domain" ] && [ -n "$DEPLOY_DOMAIN" ]; then
echo "访问地址: http://${DEPLOY_DOMAIN} (配置 Nginx 后)" echo "访问地址: http://${DEPLOY_DOMAIN} (配置 Nginx 后)"
[ "$DEPLOY_HTTPS" = true ] && echo "HTTPS 已启用" if [ "$DEPLOY_HTTPS" = true ]; then
echo "HTTPS 已启用"
fi
fi fi
echo "" echo ""
} }