admin
c1b5e4d966
- 变更规模：新增 514 / 修改 62 / 重命名 155 / 删除 4（归档重组与文档轮次） - .gitignore 修：`归档/**/db-cwd归一-备份-*/` —— 原规则写绝对层级（归档/db-cwd归一-…）， 目录搬进 归档/配置与备份/ 后**静默失效**，43 MB 的 DB 备份又变成未跟踪 - .gitignore 补：嵌套 git 内部数据（归档/内嵌git-20261008/、归档/skills-git-旧线-20261007/dotgit-原样移出/） - .gitignore 补：运行态与部署副本（.workbuddy/collab/、.workbuddy/tools/、.workbuddy/.load-pending、.workbuddy/tmp-*） - .gitignore 补：备份件（*.bak-*） - 未跟踪文件从 2190 降到 890（其余为 归档/ 归档件与 .workbuddy/memory/ 知识文件，按口径入库）
24 lines
1.4 KiB
Bash
24 lines
1.4 KiB
Bash
set -u
|
|
TS=$(date +%Y%m%d-%H%M%S)
|
|
echo "=== [1] 备份 ==="
|
|
cp -a /etc/systemd/system/dshs.service.d/overlay-443fb.conf "/etc/systemd/system/dshs.service.d/overlay-443fb.conf.bak-dom-$TS"
|
|
cp -a /etc/dshs.env "/etc/dshs.env.bak-seeds-$TS"
|
|
ls -la "/etc/systemd/system/dshs.service.d/overlay-443fb.conf.bak-dom-$TS" "/etc/dshs.env.bak-seeds-$TS"
|
|
echo "=== [2] 安装新 drop-in ==="
|
|
install -m 644 /tmp/overlay-443fb.conf.new /etc/systemd/system/dshs.service.d/overlay-443fb.conf
|
|
grep -n "BOOTSTRAP_SEEDS\|ADDR_OVERRIDES" /etc/systemd/system/dshs.service.d/overlay-443fb.conf
|
|
echo "=== [3] 从 /etc/dshs.env 删除重复键 ==="
|
|
grep -v "^DSHS_OVERLAY_BOOTSTRAP_SEEDS=" /etc/dshs.env > /tmp/dshs.env.new
|
|
install -m 600 /tmp/dshs.env.new /etc/dshs.env
|
|
echo "残留计数（应为 0）："; grep -c "DSHS_OVERLAY_BOOTSTRAP_SEEDS" /etc/dshs.env || true
|
|
echo "=== [4] daemon-reload + restart dshs ==="
|
|
systemctl daemon-reload
|
|
systemctl restart dshs
|
|
sleep 6
|
|
systemctl is-active dshs
|
|
PID=$(systemctl show dshs -p MainPID --value)
|
|
echo "=== [5] 生效环境（进程实际）==="
|
|
tr '\0' '\n' < /proc/$PID/environ | grep -E "DSHS_OVERLAY_BOOTSTRAP_SEEDS|DSHS_OVERLAY_ADDR_OVERRIDES|DSHS_BASE_DOMAIN|DSHS_COOKIE_DOMAIN"
|
|
echo "=== [6] 启动日志（候选链 / 地址覆盖）==="
|
|
journalctl -u dshs --since @$(date -d '90 sec ago' +%s) --no-pager 2>/dev/null | grep -iE "overlay-candidates|addr-override|relay-client|registered" | tail -12
|