From dd6d071c34ae94952083e43364d2ce5e457c2857 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 21 Sep 2026 14:38:16 -0400 Subject: [PATCH] buzz ssl --- bin/ABOUTME.md | 45 +++++++++--------- bin/lib/cmds.nu | 74 +++++++++++++++++++++++++++++- bin/lib/helpers.nu | 21 +++++++++ configs/ABOUTME.md | 29 ++++++------ configs/pki/ABOUTME.md | 33 +++++++++++++ configs/pki/buzz.app.internal.crt | 26 +++++++++++ configs/pki/lab-ca.crt | 30 ++++++++++++ configs/pki/lab-ca.srl | 1 + hosts/hl-minipc1.nix | 37 +++++++++++++-- modules/core/ABOUTME.md | 5 ++ modules/core/default.nix | 1 + modules/core/lab-ca.nix | 8 ++++ secrets.nix | 2 + secrets/buzz-tls-key.age | Bin 0 -> 2026 bytes secrets/lab-ca-key.age | Bin 0 -> 3484 bytes 15 files changed, 270 insertions(+), 42 deletions(-) create mode 100644 bin/lib/helpers.nu create mode 100644 configs/pki/ABOUTME.md create mode 100644 configs/pki/buzz.app.internal.crt create mode 100644 configs/pki/lab-ca.crt create mode 100644 configs/pki/lab-ca.srl create mode 100644 modules/core/lab-ca.nix create mode 100644 secrets/buzz-tls-key.age create mode 100644 secrets/lab-ca-key.age diff --git a/bin/ABOUTME.md b/bin/ABOUTME.md index 8bf78ef..536ea2c 100644 --- a/bin/ABOUTME.md +++ b/bin/ABOUTME.md @@ -11,32 +11,35 @@ bin/ ├── temp-monitor # NuShell script: collect CPU/GPU temps to CSV + optional graph ├── TEMP_MONITOR_README.md # Usage docs for temp-monitor └── lib/ - ├── cmds.nu # All subcommand implementations (NuShell — source of truth) + ├── cmds.nu # All subcommand implementations (NuShell — source of truth); commands only + ├── helpers.nu # Shared helpers: REPO_ROOT const + internal functions used by commands ├── profile.nu # Profile helpers and tab-completion data - └── types.nu # Type definitions + └── types.nu # Type definitions ``` ## Key Commands -| Command | Description | -| -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `skyg os switch` | Rebuild and switch local system | -| `skyg remote switch ` | Deploy to a remote host | -| `skyg remote install ` | Fresh-install a remote host via nixos-anywhere, using `hosts/.disko.nix`. Always wipes the disks in that file. Aborts if the file is missing, if the host already boots NixOS from disk (unless `--force-wipe`), or if you do not type the short hostname. | -| `skyg hm switch` | Apply Home Manager config | -| `skyg update [input]` | Update flake inputs | -| `skyg build-image iso | pi1 | pi2` | Build bootable image — ISO (`iso`) or Pi SD card image (`pi1`, `pi2`) | -| `skyg openwrt` | Deploy OpenWrt config | -| `skyg rollback` | Roll back to previous generation | -| `skyg profiles` | List valid local/remote profiles | -| `skyg check` | Run `nix flake check --no-build` | -| `skyg check-flake-versions` | Verify NixOS release version consistency in flake.nix | -| `skyg remote boot-all` | Boot all remote hosts (builds on `fwdesk`) | -| `skyg remote status` | Check status of all remote hosts | -| `skyg secrets` | List known secret names | -| `skyg decrypt ` | Decrypt a secret to `.tmp/unencrypted-` | -| `skyg encrypt [--yaml]` | Encrypt a working copy back into the secret | -| `skyg compare-secret ` | Diff the working copy against the stored secret | +| Command | Description | +| ------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `skyg os switch` | Rebuild and switch local system | +| `skyg remote switch ` | Deploy to a remote host | +| `skyg remote install ` | Fresh-install a remote host via nixos-anywhere, using `hosts/.disko.nix`. Always wipes the disks in that file. Aborts if the file is missing, if the host already boots NixOS from disk (unless `--force-wipe`), or if you do not type the short hostname. | +| `skyg hm switch` | Apply Home Manager config | +| `skyg update [input]` | Update flake inputs | +| `skyg build-image iso | pi1 | pi2` | Build bootable image — ISO (`iso`) or Pi SD card image (`pi1`, `pi2`) | +| `skyg openwrt` | Deploy OpenWrt config | +| `skyg rollback` | Roll back to previous generation | +| `skyg profiles` | List valid local/remote profiles | +| `skyg check` | Run `nix flake check --no-build` | +| `skyg check-flake-versions` | Verify NixOS release version consistency in flake.nix | +| `skyg remote boot-all` | Boot all remote hosts (builds on `fwdesk`) | +| `skyg remote status` | Check status of all remote hosts | +| `skyg secrets` | List known secret names | +| `skyg decrypt ` | Decrypt a secret to `.tmp/unencrypted-` | +| `skyg encrypt [--yaml]` | Encrypt a working copy back into the secret | +| `skyg compare-secret ` | Diff the working copy against the stored secret | +| `skyg ca init` | Generate the lab root CA: key → `secrets/lab-ca-key.age`, cert → `configs/pki/lab-ca.crt` (see `configs/pki/ABOUTME.md`) | +| `skyg ca issue --for ` | Mint a TLS leaf cert signed by the lab CA: cert → `configs/pki/.crt`, key → `secrets/-tls-key.age`. Auto-registers missing `secrets.nix` entries. | ## Agent Note diff --git a/bin/lib/cmds.nu b/bin/lib/cmds.nu index 33d3faf..9da5ac2 100644 --- a/bin/lib/cmds.nu +++ b/bin/lib/cmds.nu @@ -1,7 +1,6 @@ use types.nu * use profile.nu * - -const REPO_ROOT = path self | path dirname | path dirname | path dirname +use helpers.nu * export def skyg [] { print $REPO_ROOT @@ -473,3 +472,74 @@ export def "skyg compare-secret" [secret: string] { rm -f $temp_decrypted } + +# Generate the lab root CA: key encrypted to secrets/lab-ca-key.age, +# public cert written to configs/pki/lab-ca.crt. Run once, before `ca issue`. +export def "skyg ca init" [ + --days: int = 3650 # CA lifetime in days +] { + cd $REPO_ROOT + let cert = "configs/pki/lab-ca.crt" + let key_secret = "secrets/lab-ca-key.age" + if ($cert | path exists) { + error make {msg: $"($cert) already exists — refusing to overwrite the CA. Delete it manually to rotate."} + } + ensure-secret-entry $key_secret ["ari"] + mkdir .tmp configs/pki + let tmp_key = ".tmp/lab-ca-key.pem" + (openssl req -x509 -newkey rsa:4096 -sha256 -days $days -nodes + -keyout $tmp_key -out $cert + -subj "/CN=Skyg Lab CA" + -addext "basicConstraints=critical,CA:TRUE" + -addext "keyUsage=critical,keyCertSign,cRLSign") + ^cat $tmp_key | agenix -e $key_secret + rm -f $tmp_key + print $"✅ CA cert: ($cert) — commit this" + print $"✅ CA key encrypted: ($key_secret)" + print "Next: skyg ca issue --for " +} + +# Issue a TLS cert for a domain, signed by the lab CA. +# Writes configs/pki/.crt; encrypts the key to secrets/-tls-key.age. +export def "skyg ca issue" [ + domain: string # e.g. buzz.app.internal + --for: string # secrets.nix key name allowed to decrypt the leaf key (e.g. minipc1) + --days: int = 825 # leaf lifetime (825 = browser max) + --name: string # secret slug override (default: first DNS label) +] { + cd $REPO_ROOT + let ca_cert = "configs/pki/lab-ca.crt" + let ca_key_secret = "secrets/lab-ca-key.age" + if not ($ca_cert | path exists) { + error make {msg: "No CA found — run `skyg ca init` first"} + } + let key_names = (^cat secrets.nix | parse --regex '(\w+) = "ssh-' | get capture0) + if ($for not-in $key_names) { + error make {msg: $"Unknown recipient '($for)'. Known: ($key_names | str join ', ')"} + } + let slug = $name | default ($domain | split row "." | first) + let secret = $"secrets/($slug)-tls-key.age" + let cert = $"configs/pki/($domain).crt" + if ($cert | path exists) { + error make {msg: $"($cert) already exists — delete it manually to re-issue."} + } + ensure-secret-entry $secret ["ari" $for] + mkdir .tmp configs/pki + let ca_key = ".tmp/lab-ca-key.pem" + agenix -d $ca_key_secret | save -f $ca_key + let leaf_key = $".tmp/($slug)-tls-key.pem" + let csr = $".tmp/($slug).csr" + let ext = $".tmp/($slug)-ext.cnf" + $"basicConstraints=critical,CA:FALSE\nkeyUsage=critical,digitalSignature,keyEncipherment\nextendedKeyUsage=serverAuth\nsubjectAltName=DNS:($domain)\n" | save -f $ext + (openssl req -newkey rsa:2048 -nodes + -keyout $leaf_key -out $csr + -subj $"/CN=($domain)") + (openssl x509 -req -in $csr + -CA $ca_cert -CAkey $ca_key -CAcreateserial + -out $cert -days $days -sha256 -extfile $ext) + ^cat $leaf_key | agenix -e $secret + rm -f $ca_key $leaf_key $csr $ext + print $"✅ Cert: ($cert) — commit this" + print $"✅ Key encrypted: ($secret)" + print $"Wire it up: age.secrets.($slug)-tls-key.file = ../($secret);" +} diff --git a/bin/lib/helpers.nu b/bin/lib/helpers.nu new file mode 100644 index 0000000..1015f9e --- /dev/null +++ b/bin/lib/helpers.nu @@ -0,0 +1,21 @@ +export const REPO_ROOT = path self | path dirname | path dirname | path dirname + +# Insert a secrets.nix entry for the given secret path if missing. +export def ensure-secret-entry [secret_path: string, recipients: list] { + let file = "secrets.nix" + # Read via external cat — `open` type-guessing on .nix files is unreliable. + let content = (^cat $file) + if ($content | str contains $secret_path) { + return + } + let entry = $' "($secret_path)".publicKeys = [ ($recipients | str join " ") ];' + let lines = ($content | lines) + # Insert before the final top-level closing brace. + let closing = ($lines | enumerate | where item == "}" | last) + if $closing == null { + error make {msg: $"Could not find the final '}' in ($file) — refusing to edit"} + } + let new_lines = ($lines | insert $closing.index $entry) + ($new_lines | str join "\n") + "\n" | save -f $file + print $"📝 Registered ($secret_path) in secrets.nix — review with git diff" +} diff --git a/configs/ABOUTME.md b/configs/ABOUTME.md index 0e17b9c..0f4577a 100644 --- a/configs/ABOUTME.md +++ b/configs/ABOUTME.md @@ -12,20 +12,21 @@ these cases where the source subdir and `~/.config` target differ. ## Contents -| Path | Description | -|---|---| -| `niri/` | Niri Wayland compositor config (legacy shared location — will be removed after hosts migrate to `/niri/`) | -| `fwbook/niri/` | Niri config for `fwbook`; linked to `~/.config/niri` by the `skyg.nixos.desktop.tiler.niri` module (mirrors the hyprland pattern) | -| `fwbook/hypr/` | Hyprland config for `fwbook` (scrolling layout + noctalia); linked to `~/.config/hypr` | -| `hl-fwdesk/hypr/` | Hyprland config for `hl-fwdesk` (Steam console); **baked into the build** via `mountAsSource`, linked to `~/.config/hypr` | -| `hl-pi1/hypr/` | Hyprland config for `hl-pi1` (clock box); linked to `~/.config/hypr` | -| `hl-fws1/hypr/` | Hyprland config for `hl-fws1` (remote slim desktop); **baked into the build** via `mountAsSource`, linked to `~/.config/hypr` | -| `hl-pi1/quickshell/` | Quickshell configs for `hl-pi1` (full-screen clock + calendar); linked to `~/.config/quickshell` | -| `fwbook/quickshell/` | Quickshell configs for `fwbook` (scrolling overview); linked to `~/.config/quickshell` | -| `extra.nu` | Extra NuShell config sourced at shell startup | -| `fwbook.knsv` | fwbook-specific Kanshi display profile | -| `libinput-gestures.conf` | Touchpad gesture bindings | -| `hypr-types/hl.lua` | Shared EmmyLua type stubs for the `hl` global; each host's Hyprland `.luarc.json` points here via `workspace.library` | +| Path | Description | +| ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------- | +| `niri/` | Niri Wayland compositor config (legacy shared location — will be removed after hosts migrate to `/niri/`) | +| `fwbook/niri/` | Niri config for `fwbook`; linked to `~/.config/niri` by the `skyg.nixos.desktop.tiler.niri` module (mirrors the hyprland pattern) | +| `fwbook/hypr/` | Hyprland config for `fwbook` (scrolling layout + noctalia); linked to `~/.config/hypr` | +| `hl-fwdesk/hypr/` | Hyprland config for `hl-fwdesk` (Steam console); **baked into the build** via `mountAsSource`, linked to `~/.config/hypr` | +| `hl-pi1/hypr/` | Hyprland config for `hl-pi1` (clock box); linked to `~/.config/hypr` | +| `hl-fws1/hypr/` | Hyprland config for `hl-fws1` (remote slim desktop); **baked into the build** via `mountAsSource`, linked to `~/.config/hypr` | +| `hl-pi1/quickshell/` | Quickshell configs for `hl-pi1` (full-screen clock + calendar); linked to `~/.config/quickshell` | +| `fwbook/quickshell/` | Quickshell configs for `fwbook` (scrolling overview); linked to `~/.config/quickshell` | +| `extra.nu` | Extra NuShell config sourced at shell startup | +| `fwbook.knsv` | fwbook-specific Kanshi display profile | +| `libinput-gestures.conf` | Touchpad gesture bindings | +| `hypr-types/hl.lua` | Shared EmmyLua type stubs for the `hl` global; each host's Hyprland `.luarc.json` points here via `workspace.library` | +| `pki/` | Public certs of the lab internal CA (`lab-ca.crt` + issued leaves), managed by `skyg ca`; **not** symlinked to `~/.config` — see `pki/ABOUTME.md` | ## Notes diff --git a/configs/pki/ABOUTME.md b/configs/pki/ABOUTME.md new file mode 100644 index 0000000..d2ab17a --- /dev/null +++ b/configs/pki/ABOUTME.md @@ -0,0 +1,33 @@ +# configs/pki/ + +Public certificates of the lab internal CA. **Public material only** — private +keys live encrypted in `secrets/` (`lab-ca-key.age`, `-tls-key.age`), +managed with agenix. + +## Contents + +| File | Description | +|---|---| +| `lab-ca.crt` | Root CA cert (`CN=Skyg Lab CA`). Trusted fleet-wide via `modules/core/lab-ca.nix` (`security.pki.certificateFiles`). | +| `lab-ca.srl` | OpenSSL serial counter, written on first `ca issue`. Needed for unique serials — commit it. | +| `.crt` | Leaf certs issued for services (e.g. `buzz.app.internal.crt`). | + +## Managed by `skyg ca` (bin/lib/cmds.nu) + +```sh +skyg ca init # one-time: generate the root CA +skyg ca issue buzz.app.internal --for minipc1 # mint a leaf for a service +``` + +- `ca init` encrypts the CA key to `secrets/lab-ca-key.age` (recipient: `ari` + only) and writes `lab-ca.crt` here. Refuses to overwrite an existing CA. +- `ca issue` decrypts the CA key to `.tmp/`, signs a leaf (SAN = domain, EKU + serverAuth, 825 days), encrypts the leaf key to `secrets/-tls-key.age` + (recipients: `ari` + the `--for` host), and writes `.crt` here. +- Both commands auto-register missing entries in `secrets.nix` — review with + `git diff` after running them. + +Never hand-edit or commit keys here. Re-issuing: delete the leaf cert and +re-run `ca issue`. Rotating the CA itself: delete `lab-ca.crt` + +`secrets/lab-ca-key.age`, re-run `ca init`, re-issue all leaves, and rebuild +every host (fleet trust comes from the committed root cert). diff --git a/configs/pki/buzz.app.internal.crt b/configs/pki/buzz.app.internal.crt new file mode 100644 index 0000000..cf3ae1c --- /dev/null +++ b/configs/pki/buzz.app.internal.crt @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE----- +MIIEVTCCAj2gAwIBAgIUDQx8Jw/33WYAu8QrkoIIjslsjAgwDQYJKoZIhvcNAQEL +BQAwFjEUMBIGA1UEAwwLU2t5ZyBMYWIgQ0EwHhcNMjYwOTIxMTgzNTA2WhcNMjgx +MjI0MTgzNTA2WjAcMRowGAYDVQQDDBFidXp6LmFwcC5pbnRlcm5hbDCCASIwDQYJ +KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMxdYhYm0gpEtHG2ZBDi5enhRz/ra0c8 +mzVLLw7NG9LtktcY1qq039okA+cv++oVzmboe0vY3Qxq+3NMqRGeNy0d/scnkfgM +dWEXG+74VbM5wtXF3Powi8RtVmJ+YImbVlpF/JUnbl5NqJkw3EM49CDc7LFnjKAa +lmJmUxWyhNuKbplNJXsg9X31HOoVXb+VQHUlU/PDapKbqAbQYJmCluBcPpnX8Xam +en4g8b2ayHW8NvJuSdTgn9nxAqRS3Gy0dXPwPdCcvo053Cum/N8k7gLP/5DTThcz +a70gaGK9LTiVVRKEbMpRB/eZN7ePQDB3KsFbq3kuZGf5VkuxikcFMuMCAwEAAaOB +lDCBkTAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggr +BgEFBQcDATAcBgNVHREEFTATghFidXp6LmFwcC5pbnRlcm5hbDAdBgNVHQ4EFgQU +Sgstg1z9GfYARiaHBecXTiwwyVkwHwYDVR0jBBgwFoAUyvy2p4VgvbXB7RQkdC/z +ArokQ4IwDQYJKoZIhvcNAQELBQADggIBAHEll1HYihr5L5VAjbEHehzVIFTlpupi +P+PcphoPNTa9yywUHE1UF7vPhWLOkOM51nMC/O2/XPWxmgrAN+2ChdpbooQqaLWo +SwF9Y8xFfL2SCswWiSLaTA4vS5/1DxUgjyKtk9mxrUZxhpwIJiybJ71LY4e0yLfd +tKAs8xr52vGM37Hbl7w0MdiPUzdP1Z1hb50diuSF0ozoyjF6FNIjB3Y24fInY7+3 +3mzg8UwkU5R1C7Nh6i/eGf/D8NENX2F1obwemPpQvt0fhra3u38WL0+1UT9HCJAy +v8/rh3XZo1ee6iNpI+/WpJTU2YfME5MtuckFl7r6mJS6wZK9z2iL6mlsgWz59oHF +gFUsHsPV6TwWG9QyULwF75mo3a2/eu2wKpKUjoZrFnE1Y70HzErXn8QOzZwA9Z26 +IyTO+BADXjfg7M/iFqdnVKyyDJJpa8ghSudi1fQVxUkMFv5e96PNk9EYeFUSNAaS +9GUsflo8ra7UJmrOFKPvruwiomLZnn0pKEiNvDynPIUZfra6B6Fy0Rwb1Lu0Tu5U +6Q9sJJzjC6oSAR4nbkKoAdfambvKur7Ci7s7z4D9LDYljGBoVkXWdIWDnmB+9HSL +XFOsFbYkbuavPi1S27+RyXZFEXY86Cjb0FWeokN+AWiOfJOnxqRpjvKHbJXW2nzU +bzNtG1JqbMvh +-----END CERTIFICATE----- diff --git a/configs/pki/lab-ca.crt b/configs/pki/lab-ca.crt new file mode 100644 index 0000000..e6fa295 --- /dev/null +++ b/configs/pki/lab-ca.crt @@ -0,0 +1,30 @@ +-----BEGIN CERTIFICATE----- +MIIFHTCCAwWgAwIBAgIUYbirgNmTL5qvmhVsAi/Nn3jLx3IwDQYJKoZIhvcNAQEL +BQAwFjEUMBIGA1UEAwwLU2t5ZyBMYWIgQ0EwHhcNMjYwOTIxMTgxOTI4WhcNMzYw +OTE4MTgxOTI4WjAWMRQwEgYDVQQDDAtTa3lnIExhYiBDQTCCAiIwDQYJKoZIhvcN +AQEBBQADggIPADCCAgoCggIBAMsIJAlrc/E5rIXjPNjeDJfvVyuR90lKMcTmdH92 +xn9mVhp1RFUQ0KV3YRgTyBlyw5bbdw3jeECs+rJTswRR7BMueFSZjTI5wThORD16 +5grtpYwsewrrLrCov2myctMeftDsCvk0MdBZkQ6XEPrrKAPZk5GyOR7LfswUcSZ7 +BaIs+GNPOMSuH5WZYCMWOtwjwqvTiy8AhocjNk6+fvYl26a1b5+x/ZlgSBOLXpHS +FuCqhCOBUZTbmkW6dD2mB6VCw3kKLZXgJjuqh63nCTkeHnRhy/b+FDPof00Sqpi6 +cQ9vP85JlAeNxmkCfNoTT5+JpEJKtqN3LrAJzlcgPbU2OMGdb+lXzw4ZaG+qm3Xu +IX5MsXijhN81s/EbtGt58cEG7lAX/r+H4h3DeS2z+k1oJ9kMteX1pbXQjTOeuafz +sabMS5nhq/cOfymIX5Y3muQ9/KxNT9/rNUYE2QQvhhJK14wpjB/z5OvgFnBaffKM +DcHJr+VEld4zAokGpw02Cgfzm9z5eeeKQ0/+GVasyDeaRfBNs+wdD7SZrTqcK/fC +71gQlv2le8ScN3nxWVQl7R17hZZsEObgcf3RGnLlTLUnVGOBv8qO6mcVJtOM6g6A +B5U1OTOpXqHG4EgQfFs+5F14B1x3yQPEe6mNxM1NGbhvjgS5XicF6x+RYioYfMYk +RZQ3AgMBAAGjYzBhMB0GA1UdDgQWBBTK/LanhWC9tcHtFCR0L/MCuiRDgjAfBgNV +HSMEGDAWgBTK/LanhWC9tcHtFCR0L/MCuiRDgjAPBgNVHRMBAf8EBTADAQH/MA4G +A1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAJJfIdGbpFWw1tLQyR6sv +X0Xcct1EMabYN8hxyIbNq/ihS9m/+01WgLgDon65ePtT1nttr1u37F8knA7bi9uU +KGC2+wFN4yYBTjn7gzQhV794/jo7LLmLOig1D9qs9/xgVsw0lOlOCOrOnCv/caD2 +yJulhlT5AKKZJUPkqaT+4wd+QkurkL61DfJC/A95hZi95BLFe9visrCOQA4hV1mW +8Uhzvy+Y9YeMOzgp83UrIkrCNI49jjYDFhcb4+5iwboPyk37VFcveNkYvAKSrkIH +0TCMm7zGl3xFg7xPO5c3J7xt1cwNT+UKHvalw/2+cvkY32YJVY6B99xIi6RJohVi +VOgwl1or1NM0KDxFW/Rk6ghCVAhrvMi+dt4g7KC4B4T+oQCaslDNPxlfUzH53rXR +ZAXZeubGIApQOWSuN8qJWhI9QzvhFB8Z4nGc5e263ahmLFCUOS96xBYilF1lcecV +17S8PrD/iPzxtNr0+QywRaEWvcr4HkoIBqXz4eDItAblAHxQirsEW8zGQZnhLknP +z3F0iyuc+D2xYIpWBQxJbX9+VSJhg9QwJAci9w66/KfbQsRdmIEe9OS1vjHBK0Mo +9IGkkA/pIlHa53XnKdc5xaP9It+v+7vSwvf+8Bd+9xnlee+pwngyjSAVM8UcRxa/ +MatVc3nqoVfU70eTAAdm3Qo= +-----END CERTIFICATE----- diff --git a/configs/pki/lab-ca.srl b/configs/pki/lab-ca.srl new file mode 100644 index 0000000..4a995f3 --- /dev/null +++ b/configs/pki/lab-ca.srl @@ -0,0 +1 @@ +0D0C7C270FF7DD6600BBC42B9282088EC96C8C08 diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index 31a53ea..c82ca72 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -36,9 +36,12 @@ let domain = "buzz.app.internal"; port = 3000; ip = "10.0.101.3"; + # Caddy TLS terminator — buzz.app.internal points here (443/80). + caddyIp = "10.0.101.5"; bucket = "buzz-media"; images = { relay = "ghcr.io/block/buzz:main"; + caddy = "caddy:2-alpine"; posgres = "postgres:17-alpine"; redis = "redis:7-alpine"; minio = "quay.io/minio/minio:RELEASE.2025-09-07T16-13-09Z@sha256:14cea493d9a34af32f524e538b8346cf79f3321eff8e708c1e2960462bd8936e"; @@ -255,6 +258,8 @@ in # Buzz — relay + postgres + redis + minio (S3). age.secrets.buzz-env.file = ../secrets/buzz-env.age; + # TLS key for buzz.app.internal, minted by `skyg ca issue` (lab CA). + age.secrets.buzz-tls-key.file = ../secrets/buzz-tls-key.age; skyg.nixos.common.container-services.buzz = { enable = true; autoUpdate.enable = true; @@ -285,16 +290,15 @@ in internal = { }; lan = { ipv4_address = buzz.ip; }; }; - dns.names = [ buzz.domain ]; environmentFiles = [ config.age.secrets.buzz-env.path ]; environment = { BUZZ_BIND_ADDR = "0.0.0.0:${toString buzz.port}"; BUZZ_HEALTH_PORT = "8080"; BUZZ_METRICS_PORT = "9102"; - RELAY_URL = "ws://${buzz.domain}:${toString buzz.port}"; - BUZZ_MEDIA_BASE_URL = "http://${buzz.domain}:${toString buzz.port}/media"; - BUZZ_MEDIA_SERVER_DOMAIN = "${buzz.domain}:${toString buzz.port}"; - BUZZ_CORS_ORIGINS = "http://${buzz.domain}:${toString buzz.port}"; + RELAY_URL = "wss://${buzz.domain}"; + BUZZ_MEDIA_BASE_URL = "https://${buzz.domain}/media"; + BUZZ_MEDIA_SERVER_DOMAIN = buzz.domain; + BUZZ_CORS_ORIGINS = "https://${buzz.domain}"; BUZZ_S3_ENDPOINT = "http://minio:9000"; BUZZ_S3_REGION = "us-east-1"; BUZZ_S3_ADDRESSING_STYLE = "path"; @@ -317,6 +321,29 @@ in }; }; + # TLS terminator — owns buzz.app.internal (443/80), proxies to the relay + # over the internal network. Cert minted by `skyg ca issue` (lab CA). + caddy = { + image = buzz.images.caddy; + extraConfig.depends_on.relay.condition = "service_healthy"; + networks = { + internal = { }; + lan = { ipv4_address = buzz.caddyIp; }; + }; + dns.names = [ buzz.domain ]; + files."/etc/caddy/Caddyfile" = '' + ${buzz.domain} { + tls /etc/caddy/tls/cert.pem /etc/caddy/tls/key.pem + encode zstd gzip + reverse_proxy relay:${toString buzz.port} + } + ''; + volumes = [ + "${../../configs/pki/buzz.app.internal.crt}:/etc/caddy/tls/cert.pem:ro" + "${config.age.secrets.buzz-tls-key.path}:/etc/caddy/tls/key.pem:ro" + ]; + }; + postgres = { image = buzz.images.posgres; networks = [ "internal" ]; diff --git a/modules/core/ABOUTME.md b/modules/core/ABOUTME.md index a6da3c7..9edb5ec 100644 --- a/modules/core/ABOUTME.md +++ b/modules/core/ABOUTME.md @@ -11,6 +11,7 @@ core/ ├── default.nix # Entry point: imports the files below + overlays + remote builder ├── user.nix # skyg.user.* — the human user + Home Manager wiring ├── nix-substituters.nix # skyg.core.substituters.* — binary caches & trusted keys +├── lab-ca.nix # Fleet-wide trust of the lab internal CA (configs/pki/lab-ca.crt) └── macos.nix # skyg.user.macos.enableOverride — macOS-only HM tweaks ``` @@ -29,6 +30,10 @@ core/ and `bigbox2` caches, cache.nixos.org, cachix caches for cuda/cosmic/ai/noctalia, flox, devenv) and the trusted public keys. Extra entries can be appended per-host via `skyg.core.substituters.{urls,keys}`. +- **Lab CA trust** (`lab-ca.nix`): adds `configs/pki/lab-ca.crt` to + `security.pki.certificateFiles` so every machine trusts the lab internal CA + (created by `skyg ca init`, see `configs/pki/ABOUTME.md`). Eval fails if the + cert file is missing — run `skyg ca init` before the first rebuild. ## Option Namespace diff --git a/modules/core/default.nix b/modules/core/default.nix index 8b5b056..93864e2 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -4,6 +4,7 @@ ./user.nix ./macos.nix ./nix-substituters.nix + ./lab-ca.nix ]; options = { skyg.rootDir = lib.mkOption { diff --git a/modules/core/lab-ca.nix b/modules/core/lab-ca.nix new file mode 100644 index 0000000..6cd332b --- /dev/null +++ b/modules/core/lab-ca.nix @@ -0,0 +1,8 @@ +{ ... }: +{ + # Trust the lab internal CA on every machine (e.g. buzz.app.internal TLS). + # The cert is created by `skyg ca init` (public certs in configs/pki/, + # CA key encrypted in secrets/). Eval fails if the cert is missing — + # run `skyg ca init` before rebuilding. + security.pki.certificateFiles = [ ../../configs/pki/lab-ca.crt ]; +} diff --git a/secrets.nix b/secrets.nix index b36ca91..8ee6d38 100644 --- a/secrets.nix +++ b/secrets.nix @@ -34,4 +34,6 @@ in # portainer agent envs "secrets/portainer-agent-bigbox1.age".publicKeys = [ ari bigbox1 ]; + "secrets/lab-ca-key.age".publicKeys = [ ari ]; + "secrets/buzz-tls-key.age".publicKeys = [ ari minipc1 ]; } diff --git a/secrets/buzz-tls-key.age b/secrets/buzz-tls-key.age new file mode 100644 index 0000000000000000000000000000000000000000..a8ba896b57a8bed3bd23cfed59b43639753f6d88 GIT binary patch literal 2026 zcmVbX8VNLu`6wLpWqMD|%CB3N0-yAZ|-_V@YRL zVpdr{Y=hP!-jD!qox~8jO_nLdF zB3wWlABL8x%Epb7pweOLJzn*ks1p9d=d_@41bU!_9+k9bcp}XM(0ftIqt#%W|IziK zuNn(YR|1Npk{Kpwk{%HS`7p8D>!K3UP~u^{tT9J$s7PlNc5~cB?84!8+7jw}rqTg_ zHg9>mOdAwl%sJk7UUgBXc!Ez=ij!UwVsWwB%RJ(WSdc1<6AhGn41*4((v-Yi8Mne` zD_H<^^`V}IOJ}D(u&^)`+aVllrx*9~$R?wg@MAzUjVWvvwN6~1es$7(H*eI_`@U&+ znr&t)|xWXLsKQb(5zg}}7 zH}l-r0RAJ4+Ez(Kp(-71ukDW4qBxjiSyMpYn{b>5rpMtSe@U6(jtq+HA+Ykc+dQq2 zgQ#hkbZDE_bK8D#awp~QZR(vLjfGgOsW5Q(>||;AWd0{~T|-rZ>EpFa#10m(3HR^( z>?NmTUw)qa(q&LX{TV z-nx3$tybW2trUJT5f;iuGF((}pO7$Qc44CIqr`t#okUBP@Ueu=IT-J_V7NLKkxk?4 z)uCab>qcSi;keBx^6{r+RfJ{kF0e71t&(N!YJOEUk@wsQS?mu4g#Ha_D?Y4{cmD!Du2Oj9>h@J{2*f# z5xb}@{GlTOfx_#}#(fn?=M%07S3XydC%f5uK za$i7iruw?y$msKwIhHYCP>fhnn>|bD-x^g|2?DaFoRp5_3xlEFDVatAXVWAC77^|6 za$q>sbKHS46Dc(aEl?Y8V?6oNC>MygMPDM-;n5O=E0Z{x$6QU7%}#GywlEXKKX&XU zSgoSp(B4tuNAPWG8Nrv{alIZQGtVAy5##f$!_>>3k7puW|*qiS^K6fMtLX!A~(dWJ%l?oyreypR)r zub$|T$L$-{j0cc4?ZOr0oXn;K$-u7KDWmYBbi!5crb~N7%6l@$0#9Y+1=o97tsGs! zykR;fdN1R)T)}`eHOu8*sjG%vItd_i6vP$^5EqQHJW^CBvJjU+cP>)}C|6xj2IHHO|J zQ03XzhG4bcMQGQfVsUaSTk0I>FT90Sr{i zmOxe|3ltJJL zaFtnx@7;>04x^gzjmr|bha04~pbLcD-ziaBI%N1-J{eRSzZpWzlu7P{SBSaYR|hxX z;t(Xy`l=lU#qlu85|0fRa;1YeJaPG>5MHXjh&4*?q{zIKC89slcEcmv)}8!;3&luR8fzR=*?@*ZbAg1E9WV7i>@t-;K-v zUnv5!ik!u4%L;ByQ({+LItH1+;h(dzl&rU!4{t#CykVsqwK$_|P=Ux3B$PJd0%RG6 I<{<$n62I-U761SM literal 0 HcmV?d00001 diff --git a/secrets/lab-ca-key.age b/secrets/lab-ca-key.age new file mode 100644 index 0000000000000000000000000000000000000000..7334cbc9f5949563b7985bd3827b92cf70df9c18 GIT binary patch literal 3484 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 K59FyHJq0-w@Uhnb literal 0 HcmV?d00001