Merge pull request 'Refactor admin module' (#4681) from fix-admin-service-split into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4681

clanServices/admin/default.nix

@@ -41,25 +41,13 @@
           };
         };
       };
+  };
 
-    perInstance =
-      { settings, ... }:
-      {
-        nixosModule =
-          { ... }:
-          {
-            imports = [
   # We don't have a good way to specify dependencies between
   # clanServices for now. When it get's implemtende, we should just
   # use the ssh and users modules here.
+  imports = [
     ./ssh.nix
     ./root-password.nix
   ];
-
-            _module.args = { inherit settings; };
-
-            users.users.root.openssh.authorizedKeys.keys = builtins.attrValues settings.allowedKeys;
-          };
-      };
-  };
 }

clanServices/admin/root-password.nix

@@ -1,5 +1,10 @@
 # We don't have a way of specifying dependencies between clanServices for now.
 # When it get's added this file should be removed and the users module used instead.
+{
+  roles.default.perInstance =
+    { ... }:
+    {
+      nixosModule =
         {
           config,
           pkgs,
@@ -45,4 +50,6 @@
               mkpasswd -s -m sha-512 < "$out"/password | tr -d "\n" > "$out"/password-hash
             '';
           };
+        };
+    };
 }

clanServices/admin/ssh.nix

@@ -1,8 +1,13 @@
+{
+  roles.default.perInstance =
+    { settings, ... }:
+    {
+      nixosModule =
+
         {
           config,
           pkgs,
           lib,
-  settings,
           ...
         }:
         let
@@ -13,6 +18,8 @@ let
         in
         {
 
+          users.users.root.openssh.authorizedKeys.keys = builtins.attrValues settings.allowedKeys;
+
           services.openssh = {
             enable = true;
             settings.PasswordAuthentication = false;
@@ -112,4 +119,6 @@ in
             extraHostNames = builtins.map (domain: "*.${domain}") settings.certificateSearchDomains;
             publicKey = config.clan.core.vars.generators.openssh-ca.files."id_ed25519.pub".value;
           };
+        };
+    };
 }