m3ta-chiron
0cc0b5064d
Tiefen-Validierung via 'nix build .#nixosConfigurations.AZ-TC-NN.config.
system.build.toplevel' hat mehrere reale Bugs gefunden, die 'nix flake
check' nicht sah. Alle drei Pilot-Hosts bauen jetzt sauber durch.
Gefixst:
- freerdp3 → freerdp (umbenannt in nixpkgs-unstable)
- SDDM Theme.Logo will INI-Atom (string), nicht Nix-path → '${path}'
- security.pam.mount.extraVolumes will list-of-string, nicht ein String
- sudoers: 'domain admins' muss als 'domain\ admins' escaped werden
- agenix file-Pfade: ../../secrets/ → ../../../secrets/ (Tiefe korrigiert)
- snapper: config.services.snapper.package gibt es nicht → pkgs.snapper
- samba4Full entfernt (blockiert durch ceph-common python metadata issue
in nixpkgs-unstable; Thin Clients brauchen es nicht — cifs-utils reicht)
- corp-wifi-ca.pem durch gültiges Dummy-PEM ersetzt (openssl-generiert,
mit明显 REPLACE-MARKER; build kann PEM parsen)
Functional gemacht:
- Alloy: echtes River-Config mit loki.source.journal + loki.write statt
barem logging-stub. Journal-Logs mit host/unit/severity-Labels nach
Loki.
- Snipe-IT: echte Check-in-Logik via curl + jq. Lookup by asset_tag,
PATCH falls exists, POST falls neu. startAt täglich 03:30. API-Token
via agenix (snipeit-api-token.age).
- node_exporter push: realer curl-Push alle 60s mit retry on failure.
Safety:
- Placeholder-Assertions in roles/thin-client/default.nix: build schlägt
fehl, wenn wifi.ssid/hotline/company noch Placeholder sind (außer
site='staging'). Pilot-Hosts haben site='staging' bis echte Werte da.
- assets/corp-wifi-ca.pem hat deutlich sichtbaren REPLACE-Hinweis.
Neue Options:
- az.tc.monitoring.snipeItUrl (default: snipeit.az-group.local)
Neue Secrets (Placeholder .age-Files zum Ausfüllen):
- snipeit-api-token.age (fleet-wide shared)
71 lines
2.3 KiB
Nix
71 lines
2.3 KiB
Nix
# roles/thin-client/network/netbird.nix
|
|
#
|
|
# NetBird client for Thin Clients. Per-host setup-key via agenix.
|
|
# Q15 decisions: Per-Host Setup-Key, Corp DNS + NetBird DNS parallel,
|
|
# Client-only + accept-routes.
|
|
#
|
|
# SSH via NetBird: enabled (Q7).
|
|
{config, lib, pkgs, ...}: let
|
|
inherit (lib) mkIf mkOption types;
|
|
cfg = config.az.tc;
|
|
hostname = config.networking.hostName;
|
|
in {
|
|
options.az.tc.netbird = {
|
|
setupKeyFile = mkOption {
|
|
type = types.path;
|
|
default = ../../../secrets/${hostname}-netbird-setupkey.age;
|
|
readOnly = true;
|
|
description = ''
|
|
agenix-encrypted NetBird setup key for this host. Provisioned in
|
|
the NetBird UI before first boot. Decrypted to
|
|
/run/agenix/netbird-setupkey (referenced by the systemd service).
|
|
'';
|
|
};
|
|
|
|
managementUrl = mkOption {
|
|
type = types.str;
|
|
default = "https://netbird.az-group.local:443"; # TODO: real URL
|
|
description = "NetBird management URL (self-hosted).";
|
|
};
|
|
};
|
|
|
|
config = mkIf cfg.enable {
|
|
services.netbird.enable = true;
|
|
|
|
systemd.services.netbird = {
|
|
environment = {
|
|
NB_DISABLE_SSH_CONFIG = "false"; # we want SSH-via-NetBird
|
|
NB_MGMT_URL = config.az.tc.netbird.managementUrl;
|
|
NB_SETUP_KEY = "file:/run/agenix/${hostname}-netbird-setupkey";
|
|
};
|
|
path = with pkgs; [shadow util-linux];
|
|
|
|
after = ["age-identity.service" "network-online.target"];
|
|
wants = ["age-identity.service" "network-online.target"];
|
|
};
|
|
|
|
# Per-host setup key (agenix)
|
|
age.secrets."${hostname}-netbird-setupkey" = {
|
|
file = config.az.tc.netbird.setupKeyFile;
|
|
mode = "0400";
|
|
owner = "root";
|
|
group = "root";
|
|
};
|
|
|
|
# SSH config: allow SSH via NetBird hosts (the netbird binary acts as
|
|
# a ProxyCommand when the target is a NetBird peer).
|
|
programs.ssh.extraConfig = ''
|
|
Match exec "${pkgs.netbird}/bin/netbird ssh detect %h %p"
|
|
PreferredAuthentications publickey
|
|
PubkeyAuthentication yes
|
|
PasswordAuthentication no
|
|
ProxyCommand ${pkgs.netbird}/bin/netbird ssh proxy %h %p
|
|
StrictHostKeyChecking accept-new
|
|
LogLevel ERROR
|
|
'';
|
|
|
|
# Loose reverse-path filter — required for overlay networks.
|
|
networking.firewall.checkReversePath = "loose";
|
|
};
|
|
}
|