hive-c0re/src/forge.rs

@@ -66,26 +66,7 @@ async fn forge_admin(args: &[&str]) -> Result<String> {
     // `runuser` (util-linux, always present in a NixOS container)
     // beats `sudo` here — sudo isn't installed unless `security.sudo`
     // is enabled, and we don't want to depend on that.
-    //
-    // `--work-path` is mandatory: without it, the admin CLI defaults
-    // WorkPath to `dirname(executable)` (a RO nix-store path), then
-    // looks for `<WorkPath>/custom/conf/app.ini` which doesn't
-    // exist, falls back to defaults, and F3 init tries to mkdir
-    // under the nix store and fatals. The systemd unit sets
-    // WORK_PATH for the daemon; we mirror it here for the CLI.
-    cmd.args([
-        "run",
-        FORGE_CONTAINER,
-        "--",
-        "runuser",
-        "-u",
-        "forgejo",
-        "--",
-        "forgejo",
-        "--work-path",
-        "/var/lib/forgejo",
-        "admin",
-    ]);
+    cmd.args(["run", FORGE_CONTAINER, "--", "runuser", "-u", "forgejo", "--", "forgejo", "admin"]);
     cmd.args(args);
     let out = cmd
         .output()

scripts/forge-create-user.sh

@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-# Create a Forgejo user in the hive-forge container.
-#
-# Usage: forge-create-user.sh <username> [--admin] [--email <addr>] [--password <pw>]
-#
-# Defaults: --random-password, --must-change-password=false, email = <user>@hive.local.
-# Requires: sudo, the hive-forge nixos-container running.
-set -euo pipefail
-
-if [ $# -lt 1 ]; then
-  echo "usage: $0 <username> [--admin] [--email <addr>] [--password <pw>]" >&2
-  exit 2
-fi
-
-username="$1"; shift
-email="${username}@hive.local"
-admin=()
-password_args=(--random-password)
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    --admin)    admin=(--admin); shift ;;
-    --email)    email="$2"; shift 2 ;;
-    --password) password_args=(--password "$2"); shift 2 ;;
-    *) echo "unknown arg: $1" >&2; exit 2 ;;
-  esac
-done
-
-sudo nixos-container run hive-forge -- runuser -u forgejo -- \
-  forgejo --work-path /var/lib/forgejo admin user create \
-    --username "$username" \
-    --email "$email" \
-    --must-change-password=false \
-    "${password_args[@]}" \
-    "${admin[@]}"