From 96efbd3bc9b5907241760534a8eb55475bc2e99e Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Wed, 26 Aug 2026 16:55:31 -0400 Subject: [PATCH] openwrt fixes --- bin/lib/cmds.nu | 7 +++++-- modules/core/default.nix | 2 +- modules/openwrt/ABOUTME.md | 2 +- modules/openwrt/default.nix | 4 ++-- secrets/glmain.json.age | Bin 5416 -> 5409 bytes 5 files changed, 9 insertions(+), 6 deletions(-) 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 41f1ee357a14c2fd21200c03bba31ddb41d3a6be..d1e992e299457d26ee10df0ace52d0f12e7ab8f6 100644 GIT binary patch literal 5409 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 Svzu~9&c5q;$#yIY3K&1CfN4Jf