From 21fe45cbce3357f9e70716e9a98a57b75805cc9b Mon Sep 17 00:00:00 2001 From: jingrow Date: Fri, 8 Aug 2025 06:06:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E6=AC=A1=E6=89=A7=E8=A1=8C=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E9=83=BD=E9=87=8D=E5=90=AFtraefik?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install_jsite.sh | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/install_jsite.sh b/install_jsite.sh index 4b55099..980ece6 100755 --- a/install_jsite.sh +++ b/install_jsite.sh @@ -983,10 +983,18 @@ start_traefik() { return 1 fi - # 使用jingrow用户启动traefik - su - jingrow -c "cd /home/jingrow/traefik-docker && docker compose up -d" + # 检查traefik是否已经在运行,如果运行则重启,否则启动 + local traefik_running=$(su - jingrow -c "cd /home/jingrow/traefik-docker && docker compose ps -q" 2>/dev/null | wc -l) - log_success "traefik服务启动完成" + if [ "$traefik_running" -gt 0 ]; then + log_info "traefik已在运行,重启服务..." + su - jingrow -c "cd /home/jingrow/traefik-docker && docker compose restart" + else + log_info "启动新的traefik服务..." + su - jingrow -c "cd /home/jingrow/traefik-docker && docker compose up -d" + fi + + log_success "traefik服务启动/重启完成" } # 7.4. 解析SITE_URL并生成Host规则 @@ -1039,11 +1047,10 @@ create_traefik_website_config() { log_warning "traefik网站配置文件已存在,强制更新..." else log_warning "traefik网站配置文件已存在,跳过创建" - return fi fi - # 创建网站配置文件 + # 创建网站配置文件(无论是否存在都重新创建) cat > "$config_file" << EOF http: routers: @@ -1087,8 +1094,8 @@ EOF log_success "traefik网站配置文件创建完成: $config_file (端口: $project_port, 后端IP: $host_ip)" log_info "Host规则: $host_rule" - # 重启traefik以加载新配置 - log_info "重启traefik以加载新配置..." + # 每次执行都重启traefik以加载配置 + log_info "重启traefik以加载配置..." su - jingrow -c "cd /home/jingrow/traefik-docker && docker compose restart" log_success "traefik重启完成" }