HOST1 completes local onboard independently during Phase 1
partnership_manager.sh: - --local-only flag for --onboard: skips remote pre-flight, WebUI reconfig, state push; runs FolderView3 folder creation + writes HOST1_LOCAL_DONE=true to setup.db + pushes it; exits without writing ACTIVE (partnership not yet established until Phase 2) partnership_onboard.sh: - Phase 1 exit now runs partnership_manager.sh --onboard --local-only after SSH + conf push, so HOST1 is fully configured on its own side before Phase 2 include/partnership.php: - vv_pt_nodes() reads HOST1_LOCAL_DONE from setup.db; exposes as local_done on the self node (null for remote nodes) pages/partnership.php: - Self node card shows green "Local setup complete · waiting for partner" badge when local_done=true - Actions: "Complete HOST1 Setup" button appears when HOST1 hasn't run local setup yet but HOST2 is already at phase 1 — lets user trigger it manually - vvPtLocalSetup() top-level function calls partnership_manager.sh via run.php
This commit is contained in:
@@ -151,10 +151,13 @@ function vv_pt_nodes(): array {
|
||||
? vv_pt_local_system()
|
||||
: ($ts['online'] && $ts['ip'] && $mySshKey ? vv_pt_remote_system($ts['ip'], $mySshKey) : []);
|
||||
|
||||
// Onboard phase from setup.db — 0=not started, 1=SSH+conf done, 2=fully onboarded
|
||||
$nodeIdUpper = strtoupper($slot);
|
||||
$onboardPhase = ($setupDb[$nodeIdUpper . '_PHASE2_DONE'] ?? '') === 'true' ? 2
|
||||
: (($setupDb[$nodeIdUpper . '_PHASE1_DONE'] ?? '') === 'true' ? 1 : 0);
|
||||
// Onboard phase from setup.db — null=self, 0=not started, 1=SSH+conf done, 2=fully onboarded
|
||||
$nodeIdUpper = strtoupper($slot);
|
||||
$onboardPhase = $isMe ? null
|
||||
: (($setupDb[$nodeIdUpper . '_PHASE2_DONE'] ?? '') === 'true' ? 2
|
||||
: (($setupDb[$nodeIdUpper . '_PHASE1_DONE'] ?? '') === 'true' ? 1 : 0));
|
||||
// For self: local setup complete flag (set by partnership_manager --onboard --local-only)
|
||||
$localDone = $isMe && ($setupDb[$nodeIdUpper . '_LOCAL_DONE'] ?? '') === 'true';
|
||||
|
||||
$nodes[] = [
|
||||
'slot' => $slot,
|
||||
@@ -168,7 +171,8 @@ function vv_pt_nodes(): array {
|
||||
'fallback' => $fbState,
|
||||
'partnership' => $ptDb,
|
||||
'system' => $system,
|
||||
'onboard_phase' => $isMe ? null : $onboardPhase,
|
||||
'onboard_phase' => $onboardPhase,
|
||||
'local_done' => $localDone,
|
||||
];
|
||||
}
|
||||
return $nodes;
|
||||
|
||||
Reference in New Issue
Block a user