From 946b26e05f81f8468d62bea21f954711b3f2de6c Mon Sep 17 00:00:00 2001
From: Joseph Hanson <joe@veri.dev>
Date: Mon, 29 Apr 2024 11:08:53 -0500
Subject: [PATCH] Flatten array for simplicity.

---
 nixos/telperion/configuration.nix | 16 +++++++---------
 secrets.yaml                      |  9 ++++-----
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/nixos/telperion/configuration.nix b/nixos/telperion/configuration.nix
index dfd589f..a7214d4 100644
--- a/nixos/telperion/configuration.nix
+++ b/nixos/telperion/configuration.nix
@@ -13,15 +13,13 @@
   sops = {
     # Mounts unencrypted sops values at /run/secrets/rndc_keys accessible by root only by default.
     secrets = {
-      "rndc_keys" = {
-        "main" = {
-          owner = config.users.users.named.name;
-          inherit (config.users.users.named) group;
-        };
-        "externaldns" = {
-          owner = config.users.users.named.name;
-          inherit (config.users.users.named) group;
-        };
+      "rndc_keys_main" = {
+        owner = config.users.users.named.name;
+        inherit (config.users.users.named) group;
+      };
+      "rndc_keys_externaldns" = {
+        owner = config.users.users.named.name;
+        inherit (config.users.users.named) group;
       };
     };
   };
diff --git a/secrets.yaml b/secrets.yaml
index cbc4518..5748017 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -1,6 +1,5 @@
-rndc_keys:
-    main: ENC[AES256_GCM,data:ohxkgif+L3sinvm8lJXrcFIdabkO/VgH8i/Ewca5XAI9QP+2LQudDQ5V2xwEQAjy0MCDzqNdwhQwKGGotr8KshxBJZZZ4sy7ZF57FJzIM+ySUb6n5faKz9PpGFFxu8pNhQkthjEF,iv:SpUGmPT2mBOIDWzBZTAk7Mr86OakbW4CPP7hY3DLJUw=,tag:3xaQxRSZrXSgg3x/hu+Y/Q==,type:str]
-    externaldns: ENC[AES256_GCM,data:eMLZ9+vfkdtH2nxgZMB0FyCHc7+94lXLLfsyTvRVRCMKA+SKnzHQ1ep2pTGHRe8z9qdE9fzXNQAx8VyqxvQroadqFx8OA8yyfP5+A/a3GMQ3o+/dF9Nh8ysoLEZYvLk/qQYRSA0o/K39,iv:9wv4ySiQKWu4j7528aKdsX5XM/U+3BC05d/EgzK3gws=,tag:5XhYhSGETKP/exE2Zd6raA==,type:str]
+rndc_key_main: ENC[AES256_GCM,data:EUcIAl9lq/Ssft6DJLwQTUwOLDvjPxcJNjofAzInJ3CfAHlCIgiXFPjzq04IZHvc2WdVzwEfca15jGMnmscU7d5fwSAWsgJyJI9JTJ/DllyR5ndHoibGg7lsmDpMBE+V1sG9l/UT,iv:w5JSaZCxVGjAmfI2ZFqaEPb2KU8JgqAhib2VY2ODX0A=,tag:KrgJr0y1GraBENXoRfvnlA==,type:str]
+rndc_key_externaldns: ENC[AES256_GCM,data:OLw8W+XHb/uyi2v/1cq0wtZuKAaTrQn7z4ecbKCX5FLg4TmKFfVhkgwLENQsYQeUKTnap0BWiDayCr+ZDHGtew5JgxM+yG8tjznZN5CFv68OQQltnNii9blK0n3LnnArwsC7R81LCtIS,iv:QrFo7mJuzPMSw74GwGJgm/0OVp70djpgl+F0MfcOuko=,tag:ShhiG/uvomIZrqwaEEq6ug==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -25,8 +24,8 @@ sops:
             SHZmN3JDL1ExVHZ5K2txM2h6MzRKWE0KbS3kO9teIcRDY4hnb54LgWzcRQu7aGGf
             TjnTJzqKqmRRMLOs5be6wbrxBiRe9p5nCN/WJ9nqhr7rfNNMUiZePw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-29T13:34:02Z"
-    mac: ENC[AES256_GCM,data:mrsov4+aHrhdtbZAwGoSSYpRNzzOHlSasGerHmS3tkY3CNskFCpgKNsdGMRsPJdO5JQmccFIRM5FOjdhxA2df+o64HJBWqVR41GzSAczz6m8jcRonsezC/53z684sLttRozR2mLVqU13dnUTNi+IfynJU8FsdwqgUhT6Kb7IvSI=,iv:bTgYT5nczrVmpF6cSLFipvr+5vu00yAi0JkJkBLYQdQ=,tag:qQcqON806EmFy4rpla0NOA==,type:str]
+    lastmodified: "2024-04-29T16:07:13Z"
+    mac: ENC[AES256_GCM,data:3ql1GzR4+E3CeWc77TTJTDCws9YzPPlBA1nTVQfDF8RqDUInfF802LCKckuneEY+ihoy9ugP5xxXfdXsUwgNUDAaBmLIgI5lUvPNoYpXfqjzH1ElNSx+Qwv7ZphqQlcix2Yhq6y68z6CyfM5arZM1aVG99IPaf0HBuey8esZgAc=,iv:cwWqQ39kTXRPrPq4ocEhFQwxakCbzsWwmhpEi38B0kU=,tag:YZtkQxp0PTf2kMDm48bjUw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1