Archived
Compare commits
19
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2f829ba3e7 | ||
|
|
dedd69dc42 | ||
|
|
f7f670ca4c | ||
|
|
55ba283c82 | ||
|
|
2d46d25a67 | ||
|
|
f5d29be041 | ||
|
|
e10a1572c3 | ||
|
|
578ef70aa9 | ||
|
|
e9fcbbbbcb | ||
|
|
f46ae18672 | ||
|
|
fc277294f3 | ||
|
|
f3e5ea67a0 | ||
|
|
7a8aebf679 | ||
|
|
a8d95aad02 | ||
|
|
dac5fbd574 | ||
|
|
da0c651c60 | ||
|
|
97019205da | ||
|
|
5487490b8e | ||
|
|
543ea432f0 |
No files matched your search
+63
-13
@@ -63,16 +63,6 @@ creation_rules:
|
|||||||
- *lxc-nix-cache
|
- *lxc-nix-cache
|
||||||
- *proxmox-nix-cache
|
- *proxmox-nix-cache
|
||||||
|
|
||||||
# Host keytab for nix-cache FreeIPA enrollment (binary sops file).
|
|
||||||
# Generate with: sops -e --input-type binary /tmp/nix-cache.keytab > secrets/nix-cache.keytab
|
|
||||||
- path_regex: secrets/nix-cache\.keytab$
|
|
||||||
key_groups:
|
|
||||||
- age:
|
|
||||||
- *admin
|
|
||||||
- *linode-nix-cache
|
|
||||||
- *lxc-nix-cache
|
|
||||||
- *proxmox-nix-cache
|
|
||||||
|
|
||||||
- path_regex: secrets/server\.yaml$
|
- path_regex: secrets/server\.yaml$
|
||||||
key_groups:
|
key_groups:
|
||||||
- age:
|
- age:
|
||||||
@@ -136,12 +126,72 @@ creation_rules:
|
|||||||
- *linode-gui
|
- *linode-gui
|
||||||
- *proxmox-gui
|
- *proxmox-gui
|
||||||
|
|
||||||
# Host keytab for tailscale-router FreeIPA enrollment (binary sops file).
|
# IPA host keytabs (binary sops files).
|
||||||
# Generated by scripts/ipa/create-nixos-ipa-host-account.sh.
|
# Each keytab is encrypted for all platform variants of that host so any
|
||||||
|
# deployed variant can decrypt it at boot. Run
|
||||||
|
# scripts/ipa/create-nixos-ipa-host-account.sh <hostname> to enroll a new
|
||||||
|
# host and produce the keytab; this section is updated by that script.
|
||||||
|
|
||||||
|
- path_regex: secrets/nix-cache\.keytab$
|
||||||
|
key_groups:
|
||||||
|
- age:
|
||||||
|
- *admin
|
||||||
|
- *linode-nix-cache
|
||||||
|
- *lxc-nix-cache
|
||||||
|
- *proxmox-nix-cache
|
||||||
|
|
||||||
- path_regex: secrets/tailscale-router\.keytab$
|
- path_regex: secrets/tailscale-router\.keytab$
|
||||||
key_groups:
|
key_groups:
|
||||||
- age:
|
- age:
|
||||||
- *admin
|
- *admin
|
||||||
|
- *linode-tailscale-router
|
||||||
- *lxc-tailscale-router
|
- *lxc-tailscale-router
|
||||||
- *proxmox-tailscale-router
|
- *proxmox-tailscale-router
|
||||||
- *linode-tailscale-router
|
|
||||||
|
- path_regex: secrets/pxe-boot\.keytab$
|
||||||
|
key_groups:
|
||||||
|
- age:
|
||||||
|
- *admin
|
||||||
|
- *lxc-pxe-boot
|
||||||
|
- *proxmox-pxe-boot
|
||||||
|
|
||||||
|
# nixos = the workstation (hosts/nixos/host.nix). All gui platform variants
|
||||||
|
# share the hostname "nixos" and must be able to decrypt at boot.
|
||||||
|
- path_regex: secrets/nixos\.keytab$
|
||||||
|
key_groups:
|
||||||
|
- age:
|
||||||
|
- *admin
|
||||||
|
- *baremetal-gui
|
||||||
|
- *lxc-gui
|
||||||
|
- *proxmox-gui
|
||||||
|
- *linode-gui
|
||||||
|
|
||||||
|
- path_regex: secrets/server\.keytab$
|
||||||
|
key_groups:
|
||||||
|
- age:
|
||||||
|
- *admin
|
||||||
|
- *linode-server
|
||||||
|
- *lxc-server
|
||||||
|
- *proxmox-server
|
||||||
|
|
||||||
|
- path_regex: secrets/docker\.keytab$
|
||||||
|
key_groups:
|
||||||
|
- age:
|
||||||
|
- *admin
|
||||||
|
- *linode-docker
|
||||||
|
- *lxc-docker
|
||||||
|
- *proxmox-docker
|
||||||
|
|
||||||
|
- path_regex: secrets/tor-relay\.keytab$
|
||||||
|
key_groups:
|
||||||
|
- age:
|
||||||
|
- *admin
|
||||||
|
- *lxc-tor-relay
|
||||||
|
|
||||||
|
- path_regex: secrets/nix-minimal\.keytab$
|
||||||
|
key_groups:
|
||||||
|
- age:
|
||||||
|
- *admin
|
||||||
|
- *lxc-minimal
|
||||||
|
- *proxmox-minimal
|
||||||
|
- *linode-minimal
|
||||||
Generated
+6
-6
@@ -173,11 +173,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1784350909,
|
"lastModified": 1785119570,
|
||||||
"narHash": "sha256-ZWyzLbS1yKUTeFJLmdVuWNnHttL333/ldJbEE+KzCrM=",
|
"narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "4ce190229c73d44536caa7072f6308fb2d8feeb3",
|
"rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -259,11 +259,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1784432872,
|
"lastModified": 1785104993,
|
||||||
"narHash": "sha256-n3gKTBIV4ZA5VQpUakffBe3KGu4+mhPoA34rrqS0GkA=",
|
"narHash": "sha256-eKbrvPoAOFutbYMdbB3r5EQVmFxKv24iKqHPPUXA0gM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "fd1462031fdee08f65fd0b4c6b64e22239a77870",
|
"rev": "8623c4c20aa4ca2f5fb81510d2944066c3fb0d96",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -6,15 +6,10 @@
|
|||||||
name = "nix-cache";
|
name = "nix-cache";
|
||||||
sopsFile = ../../secrets/nix-cache.yaml;
|
sopsFile = ../../secrets/nix-cache.yaml;
|
||||||
})
|
})
|
||||||
(import ../../modules/ipa/client.nix {
|
|
||||||
keytabSopsFile = ../../secrets/nix-cache.keytab;
|
|
||||||
caCertFile = ../../certs/ipa-ca.crt;
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = vars.nixCacheHost;
|
hostName = vars.nixCacheHost;
|
||||||
domain = vars.homeDomain;
|
|
||||||
useDHCP = false;
|
useDHCP = false;
|
||||||
interfaces.${vars.lxcLanInterface}.ipv4.addresses = [{
|
interfaces.${vars.lxcLanInterface}.ipv4.addresses = [{
|
||||||
address = vars.nixCacheIp;
|
address = vars.nixCacheIp;
|
||||||
|
|||||||
@@ -6,11 +6,6 @@
|
|||||||
name = "tailscale-router";
|
name = "tailscale-router";
|
||||||
sopsFile = ../../secrets/tailscale-router.yaml;
|
sopsFile = ../../secrets/tailscale-router.yaml;
|
||||||
})
|
})
|
||||||
(import ../../modules/ipa/client.nix {
|
|
||||||
keytabSopsFile = ../../secrets/tailscale-router.keytab;
|
|
||||||
caCertFile = ../../certs/ipa-ca.crt;
|
|
||||||
})
|
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
|||||||
@@ -1,6 +1,17 @@
|
|||||||
{ config, pkgs, lib, inputs, vars, ... }:
|
{ config, pkgs, lib, inputs, vars, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
imports = [
|
||||||
|
../docker/enable-service.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(final: prev: {
|
||||||
|
docker = prev.docker_29;
|
||||||
|
docker_cli = prev.docker_29;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
inputs.nixos-conf-editor.packages.${pkgs.stdenv.hostPlatform.system}.nixos-conf-editor
|
inputs.nixos-conf-editor.packages.${pkgs.stdenv.hostPlatform.system}.nixos-conf-editor
|
||||||
nodejs
|
nodejs
|
||||||
@@ -18,7 +29,7 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
boot.loader.grub.useOSProber = true;
|
boot.loader.grub.useOSProber = true;
|
||||||
programs.direnv.enable = true;
|
programs.direnv.enable = true;
|
||||||
services = {
|
services = {
|
||||||
xserver = {
|
xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
# Include the results of the hardware scan.
|
# Include the results of the hardware scan.
|
||||||
# ./hardware-configuration.nix
|
# ./hardware-configuration.nix
|
||||||
./set-locale.nix
|
./set-locale.nix
|
||||||
|
../ipa/client.nix
|
||||||
];
|
];
|
||||||
# Use the GRUB 2 boot loader.
|
# Use the GRUB 2 boot loader.
|
||||||
# boot.loader.grub.enable = true;
|
# boot.loader.grub.enable = true;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, vars, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# virtualisation.docker.enable = true;
|
# virtualisation.docker.enable = true;
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
# experimental = true;
|
# experimental = true;
|
||||||
# };
|
# };
|
||||||
};
|
};
|
||||||
|
users.users.${vars.primaryUser}.extraGroups = [ "docker" ];
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
docker-compose
|
docker-compose
|
||||||
docker-buildx
|
docker-buildx
|
||||||
|
|||||||
+48
-34
@@ -1,53 +1,43 @@
|
|||||||
# Fully declarative FreeIPA domain membership.
|
# Fully declarative FreeIPA domain membership.
|
||||||
#
|
#
|
||||||
# Configures security.ipa (SSSD, Kerberos, PAM, NSSwitch) and places a
|
# Imported by modules/common/configuration.nix — no per-host wiring needed.
|
||||||
# pre-provisioned host keytab via sops-nix so no imperative ipa-client-install
|
# Enables itself automatically on any host that has a sops-encrypted keytab
|
||||||
# step is needed after deployment.
|
# at secrets/<hostname>.keytab; is a no-op for all other hosts.
|
||||||
#
|
#
|
||||||
# Usage (in a host.nix imports list):
|
# To enroll a new host:
|
||||||
# (import ../../modules/ipa/client.nix {
|
# 0. scripts/secrets/sync-host-keys.sh <flake-target>
|
||||||
# keytabSopsFile = ../../secrets/nix-cache.keytab;
|
# 1. scripts/ipa/create-nixos-ipa-host-account.sh [--ip <addr>] <hostname>
|
||||||
# caCertFile = ../../certs/ipa-ca.crt;
|
# (adds .sops.yaml rule, runs ipa host-add, encrypts keytab in one step)
|
||||||
# })
|
# 2. git add secrets/<hostname>.keytab .sops.yaml && git commit
|
||||||
|
# 3. Deploy — no further steps required.
|
||||||
#
|
#
|
||||||
# One-time operator setup per host (do this BEFORE deploying):
|
# Manual fallback (if the script isn't usable):
|
||||||
#
|
# a. On the FreeIPA server: ipa host-add <fqdn> [--ip-address=<ip>] --force
|
||||||
# 1. Fetch the IPA CA certificate (public — safe to commit):
|
# b. On the FreeIPA server: ipa-getkeytab -s <ipa-server> -p host/<fqdn> -k /tmp/<host>.keytab
|
||||||
# curl -o certs/ipa-ca.crt http://<ipa-server>/ipa/config/ca.crt
|
# c. From the repo root (path must match for sops creation rule to apply):
|
||||||
# Replace the placeholder at certs/ipa-ca.crt and commit it.
|
|
||||||
#
|
|
||||||
# 2. On the FreeIPA server, add the host and generate a keytab:
|
|
||||||
# ipa host-add <fqdn> --ip-address=<ip>
|
|
||||||
# ipa-getkeytab -s <ipa-server> -p host/<fqdn> -k /tmp/<host>.keytab
|
|
||||||
#
|
|
||||||
# 3. sops-encrypt the keytab as a binary secret from your admin machine
|
|
||||||
# (must run from repo root; sops matches creation rules against the file
|
|
||||||
# path, so copy to secrets/ first and encrypt in-place):
|
|
||||||
# cp /tmp/<host>.keytab secrets/<host>.keytab
|
# cp /tmp/<host>.keytab secrets/<host>.keytab
|
||||||
# sops -e --input-type binary -i secrets/<host>.keytab
|
# sops -e --input-type binary -i secrets/<host>.keytab
|
||||||
# Add secrets/<host>.keytab to .sops.yaml with the host's age key as a
|
# d. Commit secrets/<host>.keytab and the updated .sops.yaml, then deploy.
|
||||||
# recipient (see the nix-cache.keytab entry for the pattern), then run:
|
|
||||||
# scripts/secrets/sync-host-keys.sh <target> # if not done yet
|
|
||||||
# sops updatekeys secrets/<host>.keytab
|
|
||||||
# Commit the encrypted file.
|
|
||||||
#
|
#
|
||||||
# 4. nixos-rebuild switch (or create-proxmox-resource.sh) — no further
|
# vars dependencies: homeDomain, ipaServer, domainControllerIp
|
||||||
# manual enrollment steps required.
|
|
||||||
#
|
|
||||||
# vars dependencies: homeDomain, ipaServer
|
|
||||||
|
|
||||||
{ keytabSopsFile, caCertFile }:
|
|
||||||
{ config, lib, pkgs, vars, ... }:
|
{ config, lib, pkgs, vars, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
keytabPath = ../../secrets + "/${config.networking.hostName}.keytab";
|
||||||
|
enabled = builtins.pathExists keytabPath;
|
||||||
|
|
||||||
realm = lib.strings.toUpper vars.homeDomain;
|
realm = lib.strings.toUpper vars.homeDomain;
|
||||||
fqdn = "${config.networking.hostName}.${vars.homeDomain}";
|
fqdn = "${config.networking.hostName}.${vars.homeDomain}";
|
||||||
# "sweet.home" -> "dc=sweet,dc=home"
|
# "sweet.home" -> "dc=sweet,dc=home"
|
||||||
basedn = lib.strings.concatMapStringsSep "," (c: "dc=${c}") (lib.strings.splitString "." vars.homeDomain);
|
basedn = lib.strings.concatMapStringsSep "," (c: "dc=${c}") (lib.strings.splitString "." vars.homeDomain);
|
||||||
# security.ipa.certificate expects a derivation (package), not a raw path.
|
# security.ipa.certificate expects a derivation (package), not a raw path.
|
||||||
caCertPkg = pkgs.writeText "ipa-ca.crt" (builtins.readFile caCertFile);
|
caCertPkg = pkgs.writeText "ipa-ca.crt" (builtins.readFile ../../certs/ipa-ca.crt);
|
||||||
in
|
in
|
||||||
{
|
lib.mkIf enabled {
|
||||||
|
networking.domain = lib.mkDefault vars.homeDomain;
|
||||||
|
networking.nameservers = lib.mkDefault [ vars.domainControllerIp ];
|
||||||
|
|
||||||
security.ipa = {
|
security.ipa = {
|
||||||
enable = true;
|
enable = true;
|
||||||
domain = vars.homeDomain;
|
domain = vars.homeDomain;
|
||||||
@@ -60,11 +50,35 @@ in
|
|||||||
cacheCredentials = true;
|
cacheCredentials = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Fetch SSH public keys from IPA so users can log in with the key stored
|
||||||
|
# in their IPA profile rather than needing ~/.ssh/authorized_keys on every
|
||||||
|
# host. sss_ssh_authorizedkeys queries SSSD (which queries IPA LDAP).
|
||||||
|
#
|
||||||
|
# /nix/store is 1775 (group-writable by nixbld). OpenSSH 10.0+ rejects
|
||||||
|
# AuthorizedKeysCommand binaries whose path contains any group-writable
|
||||||
|
# component, silently skipping the command. Copy to /usr/local/bin (all
|
||||||
|
# components root-owned, 755) so the path passes sshd's safety check.
|
||||||
|
systemd.tmpfiles.rules = [
|
||||||
|
"d /usr/local 0755 root root - -"
|
||||||
|
"d /usr/local/bin 0755 root root - -"
|
||||||
|
"C+ /usr/local/bin/sss_ssh_authorizedkeys 0555 root root - ${pkgs.sssd}/bin/sss_ssh_authorizedkeys"
|
||||||
|
];
|
||||||
|
|
||||||
|
services.openssh.extraConfig = ''
|
||||||
|
AuthorizedKeysCommand /usr/local/bin/sss_ssh_authorizedkeys %u
|
||||||
|
AuthorizedKeysCommandUser nobody
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Create the home directory on first login if it doesn't exist yet.
|
||||||
|
# IPA users have no pre-created home on the host; without this sshd
|
||||||
|
# opens a session to a non-existent directory and resets the connection.
|
||||||
|
security.pam.services.sshd.makeHomeDir = true;
|
||||||
|
|
||||||
# Host keytab: pre-provisioned on the IPA server, sops-encrypted binary.
|
# Host keytab: pre-provisioned on the IPA server, sops-encrypted binary.
|
||||||
# Placed at /etc/krb5.keytab before SSSD starts so the host authenticates
|
# Placed at /etc/krb5.keytab before SSSD starts so the host authenticates
|
||||||
# to IPA without running ipa-client-install.
|
# to IPA without running ipa-client-install.
|
||||||
sops.secrets."ipa-host-keytab" = {
|
sops.secrets."ipa-host-keytab" = {
|
||||||
sopsFile = keytabSopsFile;
|
sopsFile = keytabPath;
|
||||||
format = "binary";
|
format = "binary";
|
||||||
path = "/etc/krb5.keytab";
|
path = "/etc/krb5.keytab";
|
||||||
owner = "root";
|
owner = "root";
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
#
|
#
|
||||||
# Options:
|
# Options:
|
||||||
# --ip <addr> Register this IP with the IPA host record (optional).
|
# --ip <addr> Register this IP with the IPA host record (optional).
|
||||||
# --dc <host> SSH to this host for ipa-getkeytab.
|
# --dc <host> SSH to this host to run IPA commands.
|
||||||
# Default: $IPA_SERVER (from env.sh / environment).
|
# Default: $IPA_SERVER (from env.sh / environment).
|
||||||
# --dc-user <u> SSH user on the domain controller. Default: wayne.
|
# --dc-user <u> SSH user on the domain controller. Default: wayne.
|
||||||
# --dry-run Print what would be done without making any changes.
|
# --dry-run Print what would be done without making any changes.
|
||||||
@@ -35,7 +35,9 @@
|
|||||||
# scripts/secrets/sync-host-keys.sh <flake-target> first so the host
|
# scripts/secrets/sync-host-keys.sh <flake-target> first so the host
|
||||||
# can decrypt its own keytab on boot. This script adds the .sops.yaml
|
# can decrypt its own keytab on boot. This script adds the .sops.yaml
|
||||||
# creation rule for secrets/<hostname>.keytab automatically, but the
|
# creation rule for secrets/<hostname>.keytab automatically, but the
|
||||||
# host age key anchor (&lxc-<hostname> etc.) must already exist.
|
# host age key anchor (&lxc-<hostname> etc.) must already exist —
|
||||||
|
# otherwise only the admin key can decrypt the keytab and the deployed
|
||||||
|
# host will fail to read it.
|
||||||
# 4. sops in PATH, or Nix available to run it via `nix run`.
|
# 4. sops in PATH, or Nix available to run it via `nix run`.
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
@@ -52,7 +54,7 @@ DC_HOST="${IPA_SERVER}"
|
|||||||
DC_USER="wayne"
|
DC_USER="wayne"
|
||||||
IP_ADDR=""
|
IP_ADDR=""
|
||||||
DRY_RUN=false
|
DRY_RUN=false
|
||||||
HOSTNAME=""
|
TARGET=""
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
sed -n '/^# Usage:/,/^[^#]/{ /^#/{ s/^# \?//; p } }' "$0"
|
sed -n '/^# Usage:/,/^[^#]/{ /^#/{ s/^# \?//; p } }' "$0"
|
||||||
@@ -68,22 +70,21 @@ while [[ $# -gt 0 ]]; do
|
|||||||
-h|--help) usage 0 ;;
|
-h|--help) usage 0 ;;
|
||||||
-*) echo "Unknown flag: $1" >&2; usage 1 ;;
|
-*) echo "Unknown flag: $1" >&2; usage 1 ;;
|
||||||
*)
|
*)
|
||||||
if [[ -n "${HOSTNAME}" ]]; then echo "Unexpected argument: $1" >&2; usage 1; fi
|
if [[ -n "${TARGET}" ]]; then echo "Unexpected argument: $1" >&2; usage 1; fi
|
||||||
HOSTNAME="$1"; shift
|
TARGET="$1"; shift
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
if [[ -z "${HOSTNAME}" ]]; then
|
if [[ -z "${TARGET}" ]]; then
|
||||||
echo "Error: hostname required." >&2
|
echo "Error: hostname required." >&2
|
||||||
usage 1
|
usage 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
FQDN="${HOSTNAME}.${HOME_DOMAIN}"
|
FQDN="${TARGET}.${HOME_DOMAIN}"
|
||||||
REALM="${HOME_DOMAIN^^}" # uppercase: SWEET.HOME
|
KEYTAB_SECRET="${REPO_ROOT}/secrets/${TARGET}.keytab"
|
||||||
KEYTAB_SECRET="${REPO_ROOT}/secrets/${HOSTNAME}.keytab"
|
|
||||||
# Temp path on the domain controller — use a name that won't collide.
|
# Temp path on the domain controller — use a name that won't collide.
|
||||||
DC_TMP="/tmp/nixos-keytab-${HOSTNAME}-$$.keytab"
|
DC_TMP="/tmp/nixos-keytab-${TARGET}-$$.keytab"
|
||||||
|
|
||||||
# --- Helpers ---
|
# --- Helpers ---
|
||||||
|
|
||||||
@@ -112,8 +113,8 @@ dc_run() {
|
|||||||
if command -v sops &>/dev/null; then
|
if command -v sops &>/dev/null; then
|
||||||
SOPS_CMD=(sops)
|
SOPS_CMD=(sops)
|
||||||
else
|
else
|
||||||
log "sops not in PATH — will use 'nix run github:NixOS/nixpkgs/nixos-25.11#sops'"
|
log "sops not in PATH — will use 'nix run nixpkgs#sops'"
|
||||||
SOPS_CMD=(nix run "github:NixOS/nixpkgs/nixos-25.11#sops" --)
|
SOPS_CMD=(nix run "nixpkgs#sops" --)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# --- Preflight checks ---
|
# --- Preflight checks ---
|
||||||
@@ -131,13 +132,13 @@ cd "${REPO_ROOT}"
|
|||||||
# also exist at that point or sops will refuse with "no matching creation
|
# also exist at that point or sops will refuse with "no matching creation
|
||||||
# rules found."
|
# rules found."
|
||||||
|
|
||||||
log "Checking .sops.yaml for creation rule: secrets/${HOSTNAME}.keytab"
|
log "Checking .sops.yaml for creation rule: secrets/${TARGET}.keytab"
|
||||||
|
|
||||||
RULE_EXISTS=false
|
RULE_EXISTS=false
|
||||||
# Match "path_regex: secrets/<hostname>...keytab" — using .*keytab rather
|
# Match "path_regex: secrets/<hostname>...keytab" — using .*keytab rather
|
||||||
# than \.keytab because the file stores the regex verbatim (\.keytab = two
|
# than \.keytab because the file stores the regex verbatim (\.keytab = two
|
||||||
# chars: backslash + dot), which a BRE \. (= escaped literal dot) won't span.
|
# chars: backslash + dot), which a BRE \. (= escaped literal dot) won't span.
|
||||||
if grep -q "path_regex: secrets/${HOSTNAME}.*keytab" .sops.yaml 2>/dev/null; then
|
if grep -q "path_regex: secrets/${TARGET}.*keytab" .sops.yaml 2>/dev/null; then
|
||||||
RULE_EXISTS=true
|
RULE_EXISTS=true
|
||||||
logn "Rule already exists — skipping addition."
|
logn "Rule already exists — skipping addition."
|
||||||
fi
|
fi
|
||||||
@@ -149,12 +150,20 @@ if ! $RULE_EXISTS; then
|
|||||||
# that have been registered get added as recipients.
|
# that have been registered get added as recipients.
|
||||||
RECIPIENTS=("*admin")
|
RECIPIENTS=("*admin")
|
||||||
for platform in lxc proxmox linode; do
|
for platform in lxc proxmox linode; do
|
||||||
anchor="${platform}-${HOSTNAME}"
|
anchor="${platform}-${TARGET}"
|
||||||
if grep -q "^ - &${anchor} " .sops.yaml; then
|
if grep -q "^ - &${anchor} " .sops.yaml; then
|
||||||
RECIPIENTS+=("*${anchor}")
|
RECIPIENTS+=("*${anchor}")
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if [[ ${#RECIPIENTS[@]} -eq 1 ]]; then
|
||||||
|
echo "Warning: no platform age keys found for '${TARGET}' in .sops.yaml." >&2
|
||||||
|
echo " Run scripts/secrets/sync-host-keys.sh <flake-target> first," >&2
|
||||||
|
echo " otherwise only the admin key can decrypt the keytab and the" >&2
|
||||||
|
echo " deployed host won't be able to read it at boot." >&2
|
||||||
|
echo " Continuing with admin-only encryption..." >&2
|
||||||
|
fi
|
||||||
|
|
||||||
# Build the indented recipient list for the YAML block.
|
# Build the indented recipient list for the YAML block.
|
||||||
RECIPIENT_YAML=""
|
RECIPIENT_YAML=""
|
||||||
for r in "${RECIPIENTS[@]}"; do
|
for r in "${RECIPIENTS[@]}"; do
|
||||||
@@ -163,9 +172,9 @@ if ! $RULE_EXISTS; then
|
|||||||
RECIPIENT_YAML="${RECIPIENT_YAML%$'\n'}" # strip trailing newline
|
RECIPIENT_YAML="${RECIPIENT_YAML%$'\n'}" # strip trailing newline
|
||||||
|
|
||||||
NEW_RULE="
|
NEW_RULE="
|
||||||
# Host keytab for ${HOSTNAME} FreeIPA enrollment (binary sops file).
|
# Host keytab for ${TARGET} FreeIPA enrollment (binary sops file).
|
||||||
# Generated by scripts/ipa/create-nixos-ipa-host-account.sh.
|
# Generated by scripts/ipa/create-nixos-ipa-host-account.sh.
|
||||||
- path_regex: secrets/${HOSTNAME}\\.keytab\$
|
- path_regex: secrets/${TARGET}\\.keytab\$
|
||||||
key_groups:
|
key_groups:
|
||||||
- age:
|
- age:
|
||||||
${RECIPIENT_YAML}"
|
${RECIPIENT_YAML}"
|
||||||
@@ -206,23 +215,37 @@ IP_FLAG=""
|
|||||||
[[ -n "${IP_ADDR}" ]] && IP_FLAG="--ip-address=${IP_ADDR}"
|
[[ -n "${IP_ADDR}" ]] && IP_FLAG="--ip-address=${IP_ADDR}"
|
||||||
|
|
||||||
# --force: create the host record even if DNS doesn't resolve it yet.
|
# --force: create the host record even if DNS doesn't resolve it yet.
|
||||||
# Pipe through grep to suppress the "already exists" warning without
|
if $DRY_RUN; then
|
||||||
# hiding real errors (ipa exits 1 for real errors, 0 for already-exists).
|
echo "[dry-run] ssh ${DC_USER}@${DC_HOST} sudo ipa host-add '${FQDN}' ${IP_FLAG} --force"
|
||||||
HOST_ADD_CMD="sudo ipa host-add '${FQDN}' ${IP_FLAG} --force 2>&1 | \
|
else
|
||||||
tee /dev/stderr | grep -q 'already exists' && echo '(host already registered)' || true"
|
HOST_ADD_OUT=$(ssh "${DC_USER}@${DC_HOST}" "sudo ipa host-add '${FQDN}' ${IP_FLAG} --force 2>&1") \
|
||||||
dc_run "bash -c \"${HOST_ADD_CMD}\""
|
&& HOST_ADD_RC=0 || HOST_ADD_RC=$?
|
||||||
|
if [[ $HOST_ADD_RC -eq 0 ]]; then
|
||||||
|
echo "${HOST_ADD_OUT}"
|
||||||
|
elif echo "${HOST_ADD_OUT}" | grep -q "already exists"; then
|
||||||
|
logn "(host already registered)"
|
||||||
|
else
|
||||||
|
echo "Error: ipa host-add failed (exit ${HOST_ADD_RC}):" >&2
|
||||||
|
echo "${HOST_ADD_OUT}" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# --- Step 3: Fetch the keytab from the domain controller ---
|
# --- Step 3: Fetch the keytab from the domain controller ---
|
||||||
|
|
||||||
log "Fetching keytab for host/${FQDN}"
|
log "Fetching keytab for host/${FQDN}"
|
||||||
|
|
||||||
dc_run "sudo ipa-getkeytab -s '${DC_HOST}' -p 'host/${FQDN}' -k '${DC_TMP}'"
|
# Remove the plaintext keytab if the script aborts before encryption completes.
|
||||||
|
# The trap is cleared at the end of step 4 once sops has encrypted it in-place.
|
||||||
|
trap 'rm -f "${KEYTAB_SECRET}"' EXIT
|
||||||
|
|
||||||
|
dc_run "sudo ipa-getkeytab -s '${IPA_SERVER}' -p 'host/${FQDN}' -k '${DC_TMP}'"
|
||||||
|
|
||||||
if $DRY_RUN; then
|
if $DRY_RUN; then
|
||||||
echo "[dry-run] Would stream ${DC_USER}@${DC_HOST}:${DC_TMP} → secrets/${HOSTNAME}.keytab"
|
echo "[dry-run] Would stream ${DC_USER}@${DC_HOST}:${DC_TMP} → secrets/${TARGET}.keytab"
|
||||||
else
|
else
|
||||||
logn "Streaming keytab from ${DC_HOST}:${DC_TMP} → secrets/${HOSTNAME}.keytab"
|
logn "Streaming keytab from ${DC_HOST}:${DC_TMP} → secrets/${TARGET}.keytab"
|
||||||
# scp can't read a root-owned temp file as wayne; pipe through sudo cat instead.
|
# scp can't read a root-owned temp file as ${DC_USER}; pipe through sudo cat instead.
|
||||||
ssh "${DC_USER}@${DC_HOST}" "sudo cat '${DC_TMP}'" > "${KEYTAB_SECRET}"
|
ssh "${DC_USER}@${DC_HOST}" "sudo cat '${DC_TMP}'" > "${KEYTAB_SECRET}"
|
||||||
|
|
||||||
logn "Removing temp file on ${DC_HOST}"
|
logn "Removing temp file on ${DC_HOST}"
|
||||||
@@ -235,24 +258,38 @@ fi
|
|||||||
# sops matches the creation rule by path. Using -i (in-place) rather than
|
# sops matches the creation rule by path. Using -i (in-place) rather than
|
||||||
# stdout redirect keeps the path intact through the encrypt call.
|
# stdout redirect keeps the path intact through the encrypt call.
|
||||||
|
|
||||||
log "Encrypting secrets/${HOSTNAME}.keytab in-place with sops"
|
log "Encrypting secrets/${TARGET}.keytab in-place with sops"
|
||||||
run "${SOPS_CMD[@]}" -e --input-type binary -i "${KEYTAB_SECRET}"
|
run "${SOPS_CMD[@]}" -e --input-type binary -i "${KEYTAB_SECRET}"
|
||||||
|
|
||||||
|
# Encryption succeeded — the file is now sops-encrypted; cancel the cleanup trap.
|
||||||
|
trap - EXIT
|
||||||
|
|
||||||
# --- Done ---
|
# --- Done ---
|
||||||
|
|
||||||
if ! $DRY_RUN; then
|
if ! $DRY_RUN; then
|
||||||
echo ""
|
echo ""
|
||||||
echo "Done. secrets/${HOSTNAME}.keytab is sops-encrypted and ready."
|
echo "Done. secrets/${TARGET}.keytab is sops-encrypted and ready."
|
||||||
echo ""
|
echo ""
|
||||||
echo "Next steps:"
|
echo "Next steps:"
|
||||||
echo " 1. Verify: grep '\"data\": \"ENC' secrets/${HOSTNAME}.keytab"
|
echo " 1. Verify: grep '\"data\": \"ENC' secrets/${TARGET}.keytab"
|
||||||
echo " 2. Stage and commit:"
|
echo " 2. Stage and commit:"
|
||||||
echo " git add secrets/${HOSTNAME}.keytab .sops.yaml"
|
echo " git add secrets/${TARGET}.keytab .sops.yaml"
|
||||||
echo " git commit -m 'secrets: add IPA keytab for ${HOSTNAME}'"
|
echo " git commit -m 'secrets: add IPA keytab for ${TARGET}'"
|
||||||
echo " 3. Add the module to hosts/${HOSTNAME}/host.nix:"
|
echo " 3. Add to hosts/${TARGET}/host.nix (networking block and imports):"
|
||||||
echo " (import ../../modules/ipa/client.nix {"
|
echo ""
|
||||||
echo " keytabSopsFile = ../../secrets/${HOSTNAME}.keytab;"
|
echo " networking = {"
|
||||||
echo " caCertFile = ../../certs/ipa-ca.crt;"
|
echo " hostName = \"${TARGET}\";"
|
||||||
echo " })"
|
echo " domain = vars.homeDomain; # required for Kerberos FQDN"
|
||||||
|
echo " nameservers = [ vars.domainControllerIp ]; # IPA DNS"
|
||||||
|
echo " ..."
|
||||||
|
echo " };"
|
||||||
|
echo ""
|
||||||
|
echo " imports = ["
|
||||||
|
echo " (import ../../modules/ipa/client.nix {"
|
||||||
|
echo " keytabSopsFile = ../../secrets/${TARGET}.keytab;"
|
||||||
|
echo " caCertFile = ../../certs/ipa-ca.crt;"
|
||||||
|
echo " })"
|
||||||
|
echo " ];"
|
||||||
|
echo ""
|
||||||
echo " 4. Deploy: nixos-rebuild switch (or create-proxmox-resource.sh)"
|
echo " 4. Deploy: nixos-rebuild switch (or create-proxmox-resource.sh)"
|
||||||
fi
|
fi
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
{
|
||||||
|
"data": "ENC[AES256_GCM,data:Q++XWxg9tvY7ugT8+8FWCC5jgOfQ1+LYLsnqN0/WGxTf5XT2VmoXvszcE/ow2BUOBG3qBTXS3OHYFPwmj1GgaBHB8rpdXX6+LveSBE2gmx1VR+NUDTxy+0/DBq411MK9n/J9eIYcybdFIE11biFSAob9EgfxBF5roCDXIPDPyVCSe6LyhNvqYPnGQsfHCbejSewLTcRQEiguP9BX96CpMPIpmaB9fHN25t5RWCgMI7MtacrRxRsyKg44+2FZstXdZrp2Wv9u86BxqdAFqtZE8qpPeGdrdzluZx9jhnw0wZPzHdKg5wS7/UrLCb0UxIQiDxDMDuuBuLGkKXfAhb6SGZU41wWAWYk548iGRUaG+79BO4HhRZNObOFvfsjpMXEfcH/Vbv/wHVY4OpJUPe/ZWK4wpL9YrY4nT0t62HH7MirOy1uhwLE50h2+6dHKj6ur5G7thkSqgzVWXQ==,iv:zaRBwS+gfXLhH30havn6Q2+oPWuLV3qBfbOj00kewlQ=,tag:Vr5iEQ2u+9YNahryhgzwSw==,type:str]",
|
||||||
|
"sops": {
|
||||||
|
"age": [
|
||||||
|
{
|
||||||
|
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArTGJnaVhleUtsWnlITE1s\nNmRCaW1QWTFNSG5LRFdmb1lzRlV5NWl3YTBNCmF6eUN6RkJBZzc0MmJJa0dKTW01\ncVh4K1VLR2lURUpKQXpxNGpQNnpSUlUKLS0tIFJONnJFWkNCR3pqalRsUW9POVBj\nQ0pFQ3ltKzBETTVXTW5sV1ppWTFJc1kKzxUboNZO+Nwn2eTWy11VP9w1pRswCHaJ\nE2dYU0oUOClVzc0oSuIJxraG6TPj1N4WGC24gS+UmpkmSuCiOeZBsw==\n-----END AGE ENCRYPTED FILE-----\n",
|
||||||
|
"recipient": "age1njap586hc0q43kr03g6c8eqhdsmk8zcafkl3f83xwlc2gqhlmfgs4tmwad"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDSmxNR1I3dUFKT0xUVG9h\nWkRIakNVeWRQOEN3blNRVjZlWHF4K2NRa0hBClRiOXlmTTJ4T2JTUEw2c1l0R2N2\nMnRwdDA5bEZlQWJRTm9vUmNKclBSU1EKLS0tIFcyeDFjbTZyVEVDUjN1VzU1VHly\nNWNDMW9rTXY2bHNWYVR0SmtMckovUzQKhTWr6yFVW9am3okCiIswwqR5+/p9OLmB\nWCgPtwoFaBt1RjUXPK4/eS4LlucR2K6V/mNMn4xVsnkIl193U9632g==\n-----END AGE ENCRYPTED FILE-----\n",
|
||||||
|
"recipient": "age16j42pdc5dr6wnj7xayhkqdj2rny9u68fcqejs50hqq42scssh4gsnrrnlt"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2ME9CbmVGcENRWksyL0pW\nOEJyUGhpbGMwWlBhVXBSeXQ2MW1EWnFuR0E4CnMwU0pjdk1YMzF5ZEhTVFlBaHZq\nam94UWVGbjhZSEx6VHBmem9JRWgwYzAKLS0tIHFJZWRyRjRHNzhXdDJSYWN3bDlR\nYVp3eGJWWkh3Y09ZWElyclZQN1ZSVFkKjR32//EcFAdMjVlNgky5zvVkwXwEN68D\nrkTuHKjiO5aV7yAQGPkdNw0UM0oRGF0u4YF3oOUcZfSvnKgDeoi2Zw==\n-----END AGE ENCRYPTED FILE-----\n",
|
||||||
|
"recipient": "age1ug787sgt6st6k82fgkrug2lzltw4qsukrrqqs3w27ewwqj8rg4hsxcmylz"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"lastmodified": "2026-07-28T00:27:46Z",
|
||||||
|
"mac": "ENC[AES256_GCM,data:AbJIHYcFpeanQsJ3x7RPL9Yjlg5BJgkepKax0fL9L/PpA03Antab93iUNG95Mp6k/duovp8Jm445lbuppDZq1dh9ij/deBa8GbzJ50wwEe9zMc3EwRKScpqZEhRPF7KlJsIjsHJyd8NkcI5ji49XkHb4Ae1//8zG5HpVgy+3b04=,iv:uxQCbMwMIfP5S1dbsvIx3F79YWEguxwox8T0YZvUBdc=,tag:3utjmBGDmPc8q4JjaXvCkA==,type:str]",
|
||||||
|
"version": "3.13.2"
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in new issue
Block a user