theta42/theta-suite
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(setup): first-run site join via CFG_MASTER_DIRECTORY_URL / CFG_MASTER_DIRECTORY_JOIN_KEY

Browse Source 
Multi-site join wiring (server + UI landed in theta-directory v2.3.0):

- bootstrap/site-join.js: runs inside the sso-manager container (same
  self-contained rule as bootstrap.js); logs in as the bootstrap admin and calls
  /api/site/join. Idempotent: an already-joined node reports 'already a spoke'.
- setup.sh step 5b: if setup.env sets CFG_MASTER_DIRECTORY_URL +
  CFG_MASTER_DIRECTORY_JOIN_KEY, run the join after the bootstrap. Only honored
  on first run (ensure_config reads setup.env once and ignores it once
  ./config/ exists), so an already-populated directory can never be merged.
- setup.env.example documents both vars.
- lint.yml also node --check's site-join.js.
This commit is contained in:
William Mantly
2026-08-10 09:12:47 -07:00
parent c6c6f09d48
commit 301770321e
4 changed files with 113 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
setup.sh
+16
View File
@@ -1153,6 +1153,22 @@ else
info "OAuth client registered + creds written into $CONFIG_DIR/proxy-secrets.js."
fi
# ── 5b. Multi-site: join an existing master directory (first-run only) ────────
# setup.env: CFG_MASTER_DIRECTORY_URL + CFG_MASTER_DIRECTORY_JOIN_KEY (mint a
# site join key on the master). Only honored on a first-run bring-up: ensure_config
# reads setup.env once and ignores it once ./config/ exists, so an already-running
# directory can never be merged into a master's. Idempotent — a node that already
# joined reports "already a spoke" and setup continues.
if [[ -n "${CFG_MASTER_DIRECTORY_URL:-}" && -n "${CFG_MASTER_DIRECTORY_JOIN_KEY:-}" ]]; then
info "Joining master site ${CFG_MASTER_DIRECTORY_URL} (CFG_MASTER_DIRECTORY_*)..."
if ! "${COMPOSE[@]}" exec -T sso-manager node /bootstrap/site-join.js \
"$CFG_MASTER_DIRECTORY_URL" "$CFG_MASTER_DIRECTORY_JOIN_KEY"; then
die "site join failed — check the master URL + site join key (mint one on the master's Site Join Keys card)."
fi
else
info "No CFG_MASTER_DIRECTORY_URL/CFG_MASTER_DIRECTORY_JOIN_KEY — running as a fresh master site."
fi
# ── 6. Start the proxy, wait for health ───────────────────────────────────────
# PROXY_GIT_COMMIT: same reasoning as SSO_GIT_COMMIT above.
PROXY_GIT_COMMIT="$(git -C proxy rev-parse --short HEAD 2>/dev/null || echo unknown)"