From a8e8c50a3006a3084e84f865cc810bc84ad51ca3 Mon Sep 17 00:00:00 2001 From: atlas Date: Sun, 31 May 2026 23:52:57 +0200 Subject: [PATCH] refactor: move ci options to services.hyperhive.forge.ci --- nix/modules/hive-ci.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/modules/hive-ci.nix b/nix/modules/hive-ci.nix index 4eeabf04..9349c1ca 100644 --- a/nix/modules/hive-ci.nix +++ b/nix/modules/hive-ci.nix @@ -5,7 +5,7 @@ ... }: let - cfg = config.services.hyperhive.ci; + cfg = config.services.hyperhive.forge.ci; forgeCfg = config.services.hyperhive.forge; # hive-c0re writes its own admin token here on first forge startup. @@ -67,7 +67,7 @@ in # Auto-registration: on first boot the container fetches a runner # registration token from the forge's admin API using the core token # hive-c0re writes to /var/lib/hyperhive/forge-core-token. No manual - # token handling needed — `ci.enable = true` is the full operator + # token handling needed — `forge.ci.enable = true` is the full operator # bootstrap. Registration flow: preStart calls the Forgejo admin API, # writes the token to /run/hive-ci/runner-token, runner registers and # persists credentials to stateDir — token file ignored on next boot. @@ -77,7 +77,7 @@ in # nspawn containers can't create the user-namespaces that nix sandboxing # requires. See docs/gotchas.md. - options.services.hyperhive.ci = { + options.services.hyperhive.forge.ci = { enable = lib.mkOption { type = lib.types.bool; default = false; @@ -142,7 +142,7 @@ in { assertion = forgeCfg.enable; message = '' - services.hyperhive.ci.enable = true requires + services.hyperhive.forge.ci.enable = true requires services.hyperhive.forge.enable = true — the runner registers against the hive-forge Forgejo instance. '';