gortium/infra
1
1
Fork 0
Code Issues 13 Pull Requests 22 Actions Packages Projects 1 Releases Wiki Activity

fix: remove sshPort from buildMachines (use SSH config instead)

Browse Source
This commit is contained in:
Hermes
2026-06-18 17:20:38 -04:00
parent 932de1752d
commit c6fd58123e
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/nixos/services/remote-builder.nix
View File

@@ -19,7 +19,7 @@ in {
port = lib.mkOption { port = lib.mkOption {
type = lib.types.port; type = lib.types.port;
default = 2424; default = 2424;
description = "SSH port on the remote build machine."; description = "SSH port — added via ~root/.ssh/config since nix.buildMachines has no sshPort option.";
}; };
systems = lib.mkOption { systems = lib.mkOption {
type = lib.types.listOf lib.types.str; type = lib.types.listOf lib.types.str;
@@ -50,7 +50,6 @@ in {
nix.buildMachines = [{ nix.buildMachines = [{
hostName = cfg.buildMachine.host; hostName = cfg.buildMachine.host;
sshUser = cfg.buildMachine.sshUser; sshUser = cfg.buildMachine.sshUser;
sshPort = cfg.buildMachine.port;
systems = cfg.buildMachine.systems; systems = cfg.buildMachine.systems;
maxJobs = cfg.buildMachine.maxJobs; maxJobs = cfg.buildMachine.maxJobs;
supportedFeatures = cfg.buildMachine.supportedFeatures; supportedFeatures = cfg.buildMachine.supportedFeatures;
@@ -60,5 +59,13 @@ in {
builders-use-substitutes = true builders-use-substitutes = true
fallback = true fallback = true
''; '';
# SSH config for the remote builder (since nix.buildMachines has no port option)
programs.ssh.extraConfig = ''
Host ${cfg.buildMachine.host}
HostName ${cfg.buildMachine.host}
Port ${toString cfg.buildMachine.port}
User ${cfg.buildMachine.sshUser}
'';
}; };
} }