openwrt fixes

This commit is contained in:
ari committed 2026-08-26 16:55:31 -04:00
1 parent e3866d75a9
commit 96efbd3bc9
5 files changed
+9 -6

No files matched your search

+5 -2
View File
@@ -300,10 +300,11 @@ export def "skyg openwrt" [
--dry-run # Render configs to .tmp/openwrt-<router>/ 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
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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-<router>/` 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
+2 -2
View File
@@ -118,10 +118,10 @@ let
# Dry-run: render the configs locally and write them to .tmp/openwrt-<router>/
# 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"
Binary file not shown.