diff --git a/scripts/moicen_start_huiwings_stack.sh b/scripts/moicen_start_huiwings_stack.sh index 109166c..05eb90c 100755 --- a/scripts/moicen_start_huiwings_stack.sh +++ b/scripts/moicen_start_huiwings_stack.sh @@ -3,6 +3,7 @@ # 在已「cp_envs + pg *_huiwings 数据 + redis 已起 + 已 cargo build --release 可选」后,nohup 起 UC/WS/KC(与现网进程方式一致:在各 crate 子目录 cargo run 以读 .env)。 # 日志轮转:见仓库 `huike-back/run_rotate.sh` 与 `plan_skills/moicen/moicen-cutover-config-worklog-2026-04-26.md` §8.1(新机 weli crontab 每 5 分钟)。 # 在 huike-back 根以: ./scripts/moicen_start_huiwings_stack.sh +# htyts:存在 htyts/.env 且未设 MOICEN_START_HTYTS=0|no 时默认随栈启动;否则显式 MOICEN_START_HTYTS=1|yes。 # 可设 MOICEN_HUIKE_ROOT / MOICEN_AUTH_ROOT 为绝对路径(默认=本脚本的 ../ 与 ../AuthCore)。 set -euo pipefail SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" @@ -54,9 +55,24 @@ _SRC_ENV='[ -f "$HOME/.cargo/env" ] && . "$HOME/.cargo/env"' ( cd "$HUIKE/htykc" && nohup "${CARGO_NO_PROXY[@]}" bash -c "$_SRC_ENV; exec cargo run $REL" >>"$HUIKE/htykc/htykc.nohup.log" 2>&1 ) & -if [ -d "$HUIKE/htyts" ] && { [ "${MOICEN_START_HTYTS:-0}" = 1 ] || [ "${MOICEN_START_HTYTS:-0}" = yes ]; }; then +# htyts:显式 MOICEN_START_HTYTS=1|yes;或未设置且存在 htyts/.env 时默认启动。MOICEN_START_HTYTS=0|no 则不启动。 +_start_htyts=0 +if [ -d "$HUIKE/htyts" ]; then + if [ "${MOICEN_START_HTYTS:-}" = 0 ] || [ "${MOICEN_START_HTYTS:-}" = no ]; then + _start_htyts=0 + elif [ "${MOICEN_START_HTYTS:-}" = 1 ] || [ "${MOICEN_START_HTYTS:-}" = yes ]; then + _start_htyts=1 + elif [ -f "$HUIKE/htyts/.env" ]; then + _start_htyts=1 + fi +fi +if [ "$_start_htyts" = 1 ]; then ( cd "$HUIKE/htyts" && nohup "${CARGO_NO_PROXY[@]}" bash -c "$_SRC_ENV; exec cargo run $REL" >>"$HUIKE/htyts/htyts.nohup.log" 2>&1 ) & fi echo "已后台启动。日志: $AUTH/htyuc/htyuc.nohup.log, $HUIKE/htyws/htyws.nohup.log, $HUIKE/htykc/htykc.nohup.log" -echo "htyts 需另设 export MOICEN_START_HTYTS=1 再执行本脚本。" +if [ "$_start_htyts" = 1 ]; then + echo "htyts 已启动(或已设 MOICEN_START_HTYTS=1|yes)。日志: $HUIKE/htyts/htyts.nohup.log" +else + echo "htyts 未启动:无 htyts/.env 时请 cp envs/moicen/htyts.env;需显式关闭时 export MOICEN_START_HTYTS=0" +fi