From 756e45743cad67fd68ba5217d7e60a518b8929c0 Mon Sep 17 00:00:00 2001 From: beatzaplenty Date: Tue, 28 Jul 2026 19:23:07 +1000 Subject: [PATCH] fix(sops): resolve merge conflict in .sops.yaml keytab recipients The HA branch merge left conflict markers in the ha-server-{1,2}.keytab path_regex entries. Keep the upstream side (adds *proxmox-ha-server-{1,2} as recipients) so each host can decrypt its own IPA keytab on boot. Co-Authored-By: Claude Sonnet 4.6 Claude-Session: https://claude.ai/code/session_01HaH1cSGvhogRP5ExoF6nD8 --- .sops.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.sops.yaml b/.sops.yaml index 4fbf46c..ed53050 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -210,11 +210,8 @@ creation_rules: key_groups: - age: - *admin -<<<<<<< Updated upstream - *proxmox-ha-server-1 # proxmox-ha-server-1 added by sync-host-keys.sh -======= ->>>>>>> Stashed changes # Host keytab for ha-server-2 FreeIPA enrollment (binary sops file). # Generated by scripts/ipa/create-nixos-ipa-host-account.sh. @@ -222,8 +219,5 @@ creation_rules: key_groups: - age: - *admin -<<<<<<< Updated upstream - *proxmox-ha-server-2 # proxmox-ha-server-2 added by sync-host-keys.sh -======= ->>>>>>> Stashed changes