diff --git a/bin/lib/cmds.nu b/bin/lib/cmds.nu index 3192b50..4028e6e 100644 --- a/bin/lib/cmds.nu +++ b/bin/lib/cmds.nu @@ -300,10 +300,11 @@ export def "skyg openwrt" [ --dry-run # Render configs to .tmp/openwrt-/ without touching the router ] { cd $REPO_ROOT + let decrypted_file = skyg decrypt $"($router).json" if $dry_run { - bash -c $"export SKYG_ROUTER=($router); age -d -i ~/.ssh/id_ed25519 secrets/($router).json.age | nix run .#openwrt-($router)-dry-run" + ^cat $decrypted_file | nix run .#openwrt-($router)-dry-run -- ($router) } else { - bash -c $"age -d -i ~/.ssh/id_ed25519 secrets/($router).json.age | nix run .#openwrt-($router)" + ^cat $decrypted_file | nix run .#openwrt-($router) } } @@ -337,6 +338,7 @@ export def "skyg decrypt" [secret: string@secret-names] { let dest = $".tmp/unencrypted-($secret)" agenix -d $src | save -f $dest print $"Decrypted to ($dest)" + return $dest } # Encrypt a file to secrets/ folder (re-encrypts using agenix) @@ -355,6 +357,7 @@ export def "skyg encrypt" [secret: string@secret-names, source?: string] { let dest = $"secrets/($secret).age" cat $src | EDITOR="cp /dev/stdin" agenix -e $dest print $"Encrypted ($dest)" + return $dest } # Compare unencrypted local version with encrypted version of a secret diff --git a/modules/core/default.nix b/modules/core/default.nix index 365c00e..26a33de 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -58,7 +58,7 @@ mandatoryFeatures = [ ]; } { - hostName = "root@hl-fwdesk.lab.internal"; + hostName = "root@fwdesk.lab.internal"; system = "x86_64-linux"; protocol = "ssh-ng"; maxJobs = 4; diff --git a/modules/openwrt/ABOUTME.md b/modules/openwrt/ABOUTME.md index e5f026a..ddd950c 100644 --- a/modules/openwrt/ABOUTME.md +++ b/modules/openwrt/ABOUTME.md @@ -37,7 +37,7 @@ age -d secrets/glmain.json.age | openwrt-deploy `openwrt-dry-run` renders the same three configs **locally** and writes them to `.tmp/openwrt-/` for review — no SSH, no `uci`, no confirm prompt. The router name -comes from the `SKYG_ROUTER` env var (default `glmain`). +is passed as a command-line argument (default `glmain`). ```bash skyg openwrt --dry-run diff --git a/modules/openwrt/default.nix b/modules/openwrt/default.nix index d1054b5..1064d4a 100644 --- a/modules/openwrt/default.nix +++ b/modules/openwrt/default.nix @@ -118,10 +118,10 @@ let # Dry-run: render the configs locally and write them to .tmp/openwrt-/ # for review. No SSH, no uci, no router changes. Run from the repo root. - # The router name is taken from $SKYG_ROUTER (default glmain). + # The router name is passed as $1 (defaults to glmain). dryRunScript = pkgs.writeShellScriptBin "openwrt-dry-run" '' set -euo pipefail - ROUTER="$'{SKYG_ROUTER:-glmain}" + if [ $# -ge 1 ]; then ROUTER="$1"; else ROUTER=glmain; fi OUTDIR=".tmp/openwrt-$ROUTER" mkdir -p "$OUTDIR" diff --git a/secrets/glmain.json.age b/secrets/glmain.json.age index 41f1ee3..d1e992e 100644 Binary files a/secrets/glmain.json.age and b/secrets/glmain.json.age differ