feat(meta): Use the module system to directly create the admin list from the groups

2025-02-06 13:40:36 +01:00 · 2025-02-06 13:40:36 +01:00 · 7eef4e2661
commit 7eef4e2661
parent 0433a00636
6 changed files with 40 additions and 53 deletions
--- a/machines/nixos/compute01/kanidm/default.nix
+++ b/machines/nixos/compute01/kanidm/default.nix
@ -14,12 +14,10 @@ let
  inherit (lib)
    attrValues
    catAttrs
-    concatLists
    escapeRegex
    concatStringsSep
    mapAttrs'
    nameValuePair
-    unique
    ;

  domain = "sso.dgnum.eu";
@ -91,18 +89,7 @@ in
          name: members: nameValuePair "grp_${name}" { members = builtins.map usernameFor members; }
        ) meta.organization.groups)
        // (mapAttrs' (
-          name:
-          {
-            admins ? [ ],
-            adminGroups ? [ ],
-          }:
-          nameValuePair "grp-admin_${name}" {
-            members = unique (
-              builtins.map usernameFor (
-                admins ++ (concatLists (builtins.map (group: meta.organization.groups.${group}) adminGroups))
-              )
-            );
-          }
+          name: srv: nameValuePair "grp-admin_${name}" { members = builtins.map usernameFor srv.admins; }
        ) meta.organization.services);

      # INFO: The authentication resources declared here can only be for internal services,