vinzenz/hyperhive
vinzenz/hyperhive
Watch
0
0
Fork
You've already forked hyperhive
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(#3500): make the swarm-controller forge account a site admin

Browse source
This commit is contained in:
damocles 2026-08-19 14:16:34 +02:00 • committed by mara
commit 582b5cf83d
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
nix/host-modules/hive-forge/default.nix
View file

@ -991,12 +991,22 @@ in
set -euo pipefail set -euo pipefail
# Idempotent by query, same reasoning as the SSO unit: assert # Idempotent by query, same reasoning as the SSO unit: assert
# the effect, not the command's exit code. # the effect, not the command's exit code. `--admin`: the
# controller creates repos in the agents org on the swarm's
# behalf, which needs org-admin standing to do at all. Only
# applies to a fresh account — `forgejo admin` has no
# in-place "promote to admin" verb (checked: `admin user`
# offers create/list/change-password/delete/
# generate-access-token/must-change-password/reset-mfa and
# nothing else), and mara's call was not to delete+recreate
# an already-provisioned non-admin account to work around
# that (every hive from before this fix has one) — she
# promotes those by hand instead.
if ! forgejo admin user list | grep -qE "[[:space:]]${swarmControllerForgeUser}[[:space:]]"; then if ! forgejo admin user list | grep -qE "[[:space:]]${swarmControllerForgeUser}[[:space:]]"; then
forgejo admin user create \ forgejo admin user create \
--username ${lib.escapeShellArg swarmControllerForgeUser} \ --username ${lib.escapeShellArg swarmControllerForgeUser} \
--email ${lib.escapeShellArg "${swarmControllerForgeUser}@hyperhive.local"} \ --email ${lib.escapeShellArg "${swarmControllerForgeUser}@hyperhive.local"} \
--random-password --must-change-password=false --admin --random-password --must-change-password=false
echo "created forge account ${swarmControllerForgeUser}" echo "created forge account ${swarmControllerForgeUser}"
fi fi
if ! forgejo admin user list | grep -qE "[[:space:]]${swarmControllerForgeUser}[[:space:]]"; then if ! forgejo admin user list | grep -qE "[[:space:]]${swarmControllerForgeUser}[[:space:]]"; then