home

commit 26dac34670227c58068fcf3e3b1ca10bd3156add
parent 55364e5860c067163c23f1d48e6fe0380759f27f
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Fri, 19 Nov 2021 18:31:54 +0100

systems/modules: fix builder…

… remove creation of user on machine that uses distributedBuilds.
For now, put them in the hosts that would have the builder role.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
systems/hosts/aomi.nix
 | 
8
++++++++
M
systems/hosts/wakasu.nix
 | 
9
+++++++++
M
systems/modules/profiles/builder.nix
 | 
8
--------

3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/systems/hosts/aomi.nix b/systems/hosts/aomi.nix
@@ -143,4 +143,12 @@ in
     };
   };
 
+  # Move this to a "builder" role
+  users.extraUsers.builder = {
+    isNormalUser = true;
+    uid = 1018;
+    extraGroups = [ ];
+    openssh.authorizedKeys.keys = [ (builtins.readFile ../../../secrets/builder.pub) ];
+  };
+  nix.trustedUsers = [ "root" "vincent" "builder" ];
 }
diff --git a/systems/hosts/wakasu.nix b/systems/hosts/wakasu.nix
@@ -95,4 +95,13 @@ in
       endpointPublicKey = endpointPublicKey;
     };
   };
+
+  # Move this to a "builder" role
+  users.extraUsers.builder = {
+    isNormalUser = true;
+    uid = 1018;
+    extraGroups = [ ];
+    openssh.authorizedKeys.keys = [ (builtins.readFile ../../../secrets/builder.pub) ];
+  };
+  nix.trustedUsers = [ "root" "vincent" "builder" ];
 }
diff --git a/systems/modules/profiles/builder.nix b/systems/modules/profiles/builder.nix
@@ -54,14 +54,6 @@ in
       };
     };
 
-    users.extraUsers.builder = {
-      isNormalUser = true;
-      uid = 1018;
-      extraGroups = [ ];
-      openssh.authorizedKeys.keys = [ (builtins.readFile ../../../secrets/builder.pub) ];
-    };
-    nix.trustedUsers = [ "root" "vincent" "builder" ];
-
   };