move links, adminSync.ignoreUsers and scrapeTargets under their service's deploy namespace
This commit is contained in:
parent
ee591b0546
commit
90272ec3c0
3 changed files with 156 additions and 108 deletions
|
|
@ -54,7 +54,7 @@ const SERVER_USER_LOCALPART: &str = "conduit";
|
|||
const GRANTED_FILE: &str = "operator-matrix-admins.json";
|
||||
|
||||
/// Whitespace-separated user ids the revoke never touches, set from
|
||||
/// `services.hyperhive.swarm.matrix.adminSync.ignoreUsers`.
|
||||
/// `services.hyperhive.deploy.swarm-controller.matrixAdminSync.ignoreUsers`.
|
||||
const IGNORE_USERS_ENV: &str = "SWARM_CONTROLLER_MATRIX_ADMIN_SYNC_IGNORE_USERS";
|
||||
|
||||
/// The localpart an SSO login by authelia user `username` lands on, or `None`
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ pub(crate) async fn get_hives(State(state): State<AppState>) -> Json<Vec<HiveEnt
|
|||
/// One quick link to a swarm-wide service (authelia, matrix, forge, this
|
||||
/// daemon's own swagger UI, …). Deliberately generic rather than named
|
||||
/// fields per service: each service's own nix module contributes its own
|
||||
/// entry to `services.hyperhive.swarm.controller.links` (same list-merge
|
||||
/// entry to `services.hyperhive.deploy.swarm-controller.links` (same list-merge
|
||||
/// idiom `services.hyperhive.gateway.localNames` already uses), so adding
|
||||
/// a new one is a nix-only change — no new field here, no swarm-ui change.
|
||||
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, ToSchema)]
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ pub(crate) fn load_hives() -> Vec<HiveEntry> {
|
|||
}
|
||||
|
||||
/// Env var the controller's NixOS module sets from the merged
|
||||
/// `services.hyperhive.swarm.controller.links` list, JSON-encoded — same
|
||||
/// `services.hyperhive.deploy.swarm-controller.links` list, JSON-encoded — same
|
||||
/// shape/rationale as [`HIVES_ENV`]. Consumed by `GET /api/links`.
|
||||
const LINKS_ENV: &str = "SWARM_CONTROLLER_LINKS";
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue