From 9c3b3a4658be4ea7326cca26a68861dfd4ab3dc4 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 2 Oct 2021 11:35:58 +0200 Subject: build-client: ... --- modules/build-client.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/build-client.nix b/modules/build-client.nix index cedfc2eb..3e171897 100644 --- a/modules/build-client.nix +++ b/modules/build-client.nix @@ -6,7 +6,7 @@ let cfg = config.nix.buildServers; secretName = name: "nix-ssh-builder-${name}-private"; - hostName = host: "nix-ssh-builder-${host}"; + buildHostName = host: "nix-ssh-builder-${host}"; in { options = { nix = { @@ -88,7 +88,7 @@ in { config = mkIf (cfg != {}) { programs.ssh.extraConfig = concatMapStringsSep "\n" ({ name, value }: '' - Host ${hostName name} + Host ${buildHostName name} User nix-ssh-builder HostName ${value.address} IdentitiesOnly yes @@ -104,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 (name: hCfg: { hostName = hostName name; inherit (hCfg) system systems maxJobs speedFactor mandatoryFeatures supportedFeatures; }) cfg; + nix.buildMachines = mapAttrsToList (name: hCfg: { hostName = buildHostName name; inherit (hCfg) system systems maxJobs speedFactor mandatoryFeatures supportedFeatures; }) cfg; }; } -- cgit v1.2.3