From 6ee516b4efae723115385db414595ef02be76811 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 2 Oct 2021 11:35:08 +0200
Subject: build-client: ...

---
 modules/build-client.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules/build-client.nix')

diff --git a/modules/build-client.nix b/modules/build-client.nix
index 763fdb38..cedfc2eb 100644
--- a/modules/build-client.nix
+++ b/modules/build-client.nix
@@ -6,6 +6,7 @@ let
   cfg = config.nix.buildServers;
 
   secretName = name: "nix-ssh-builder-${name}-private";
+  hostName = host: "nix-ssh-builder-${host}";
 in {
   options = {
     nix = {
@@ -87,7 +88,7 @@ in {
   
   config = mkIf (cfg != {}) {
     programs.ssh.extraConfig = concatMapStringsSep "\n" ({ name, value }: ''
-      Host ${name}
+      Host ${hostName name}
         User nix-ssh-builder
         HostName ${value.address}
         IdentitiesOnly yes
@@ -103,6 +104,6 @@ in {
 
     sops.secrets = mapAttrs' (name: hCfg: nameValuePair (secretName name) { sopsFile = ../system-profiles/build-server/clients + "/${hostName}/private"; format = "binary"; }) cfg;
 
-    nix.buildMachines = mapAttrsToList (hostName: hCfg: { inherit hostName; inherit (hCfg) system systems maxJobs speedFactor mandatoryFeatures supportedFeatures; }) cfg;
+    nix.buildMachines = mapAttrsToList (name: hCfg: { hostName = hostName name; inherit (hCfg) system systems maxJobs speedFactor mandatoryFeatures supportedFeatures; }) cfg;
   };
 }
-- 
cgit v1.2.3