Neutralize box/host names in comments (hub box / bridge box instead of internal hostnames)
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
// One file, sectioned per subsystem plus shared sections (redis, nodes, trunk,
|
||||
// lastheard). Read at start and on reload (SIGHUP / file-watch) and held in
|
||||
// memory. `modules` toggles which subsystems run on this box, so the same
|
||||
// binary runs all of them on speed/aldmr and only astmeta on the allstar box.
|
||||
// binary runs all of them on a reflector box and only astmeta on an AllStar bridge box.
|
||||
//
|
||||
// Secrets carry an @@PLACEHOLDER@@ that deploy-remote.sh --conf fills from the
|
||||
// live file per box, so the structure is one file but secrets differ per host.
|
||||
|
||||
+2
-2
@@ -10,8 +10,8 @@
|
||||
// svxdr — the merged svx daemon: astmeta + nodelist + proxy + xlink in ONE
|
||||
// process, each a subsystem goroutine, toggled per box by /etc/svxlink/svxdr.json.
|
||||
//
|
||||
// One binary, one config. Runs all subsystems on speed/aldmr; only astmeta on
|
||||
// the allstar box. Co-located subsystems share memory (no localhost HTTP hop);
|
||||
// One binary, one config. A reflector box runs all subsystems; a pure AllStar
|
||||
// bridge box runs only astmeta. Co-located subsystems share memory (no localhost HTTP hop);
|
||||
// the HTTP talker-meta ingest stays for a REMOTE astmeta feeding this box.
|
||||
//
|
||||
// Phase 1 scaffold: config + module toggles + lifecycle (start / SIGHUP reload /
|
||||
|
||||
@@ -15,8 +15,8 @@ package nodelist
|
||||
//
|
||||
// Which URL is read is per-box config MONITOR_STATUS_URL (falls back to
|
||||
// REFLECTOR_STATUS_URL):
|
||||
// speed → https://reflector.sm2ampr.net/geu/status/ (the master's full view)
|
||||
// aldmr → http://127.0.0.1:8080/status (its own reflector)
|
||||
// hub box → https://<master-reflector>/geu/status/ (the master's full view)
|
||||
// bridge box → http://127.0.0.1:8080/status (its own reflector)
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
@@ -309,8 +309,8 @@ func buildMonitor(client *http.Client, generated string) (monStatus, bool) {
|
||||
return monStatus{}, false
|
||||
}
|
||||
// Normalize at ingest: sat-login node callsigns -> per-TG name. Covers the
|
||||
// case where monitorStatusURL is a foreign master (e.g. speed reads the SE hub
|
||||
// where aldmr's sat nodes federate in). A local read via the proxy is already
|
||||
// case where monitorStatusURL is a foreign master (e.g. a hub box reads a foreign master
|
||||
// where its satellite nodes federate in). A local read via the proxy is already
|
||||
// normalized; re-normalizing is a harmless no-op.
|
||||
body = statusnorm.Normalize(body, renameSatNode)
|
||||
var raw struct {
|
||||
|
||||
Reference in New Issue
Block a user