cst1/infrastructure
1
0
Fork 0
forked from DGNum/infrastructure
Code Pull requests Activity

fix(keys): unique is not in extra anymore

Browse source
This commit is contained in:
Tom Hubrecht 2025-04-15 00:34:36 +02:00
parent 9f91f73270
commit 3748efa295
Signed by: thubrecht
SSH key fingerprint: SHA256:r+nK/SIcWlJ0zFZJGHtlAoRwq1Rm+WcKAm5ADYMoQPc
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/keys/default.nix
View file

@ -7,7 +7,7 @@
{ meta, lib }: { meta, lib }:
let let
inherit (lib.extra) setDefault unique; inherit (lib.extra) setDefault;
getAttr = lib.flip builtins.getAttr; getAttr = lib.flip builtins.getAttr;
in in
@ -33,14 +33,14 @@ rec {
getNodeAdmins = node: meta.organization.groups.root ++ meta.nodes.${node}.admins; getNodeAdmins = node: meta.organization.groups.root ++ meta.nodes.${node}.admins;
# All keys needed for secret encryption # All keys needed for secret encryption
getSecretKeys = node: unique (getMemberKeys (getNodeAdmins node) ++ getNodeKeys [ node ]); getSecretKeys = node: lib.unique (getMemberKeys (getNodeAdmins node) ++ getNodeKeys [ node ]);
# List of keys for all machines wide secrets # List of keys for all machines wide secrets
machineKeys = rootKeys ++ (getNodeKeys (builtins.attrNames meta.nodes)); machineKeys = rootKeys ++ (getNodeKeys (builtins.attrNames meta.nodes));
mkSecrets = nodes: setDefault { publicKeys = unique (builtins.concatMap getSecretKeys nodes); }; mkSecrets = nodes: setDefault { publicKeys = lib.unique (builtins.concatMap getSecretKeys nodes); };
mkRootSecrets = setDefault { publicKeys = unique rootKeys; }; mkRootSecrets = setDefault { publicKeys = lib.unique rootKeys; };
machineKeysBySystem = machineKeysBySystem =
system: system: