This commit is contained in:
Peder Bergebakken Sundt 2023-12-03 20:51:23 +01:00
parent 9768da9f90
commit 6e243a060a
1 changed files with 9 additions and 8 deletions

View File

@ -9,12 +9,12 @@ let
# find 'publicKey' with `ssh-keyscan` # find 'publicKey' with `ssh-keyscan`
proxyjump-ntnu = { proxyjump-ntnu = {
proxy.user = "pederbs"; proxy.user = "pederbs";
#proxy.host = "isvegg.pvv.ntnu.no"; proxy.host = "isvegg.pvv.ntnu.no";
#proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; # isvegg proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; # isvegg
#proxy.host = "hildring.pvv.ntnu.no"; #proxy.host = "hildring.pvv.ntnu.no";
#proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; # hildring #proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; # hildring
proxy.host = "microbel.pvv.ntnu.no"; #proxy.host = "microbel.pvv.ntnu.no";
proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEq0yasKP0mH6PI6ypmuzPzMnbHELo9k+YB5yW534aKudKZS65YsHJKQ9vapOtmegrn5MQbCCgrshf+/XwZcjbM="; # microbel #proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEq0yasKP0mH6PI6ypmuzPzMnbHELo9k+YB5yW534aKudKZS65YsHJKQ9vapOtmegrn5MQbCCgrshf+/XwZcjbM="; # microbel
}; };
remotes = [ remotes = [
@ -51,7 +51,7 @@ let
sshUser = "pbsds"; sshUser = "pbsds";
maxJobs = 3; # 8 cores maxJobs = 3; # 8 cores
#maxJobs = 1; # at least for big-parallel #maxJobs = 1; # at least for big-parallel
speedFactor = 3; speedFactor = 2;
supportedFeatures = [ "kvm" "big-parallel" "nixos-test" ]; supportedFeatures = [ "kvm" "big-parallel" "nixos-test" ];
#mandatoryFeatures = [ ]; #mandatoryFeatures = [ ];
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkcZ3cUAKk8uUvZPsX7PDBInkb3Eps3Xh+xVrhPY+sx"; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkcZ3cUAKk8uUvZPsX7PDBInkb3Eps3Xh+xVrhPY+sx";
@ -102,7 +102,7 @@ let
hostName = "nord.pbsds.net"; hostName = "nord.pbsds.net";
sshPort = 24; sshPort = 24;
sshUser = "pbsds"; sshUser = "pbsds";
maxJobs = 2; # 4 cores maxJobs = 1; # 4 cores
#maxJobs = 1; # at least for big-parallel #maxJobs = 1; # at least for big-parallel
speedFactor = 1; speedFactor = 1;
supportedFeatures = [ "kvm" "big-parallel" "nixos-test" ]; supportedFeatures = [ "kvm" "big-parallel" "nixos-test" ];
@ -149,6 +149,7 @@ let
filter = lib.mkIf (buildMachine.hostName != config.networking.fqdn); filter = lib.mkIf (buildMachine.hostName != config.networking.fqdn);
in filter { in filter {
nix.buildMachines = [ buildMachine ]; nix.buildMachines = [ buildMachine ];
#nix.buildMachines = [ (buildMachine // { protocol = "ssh-ng"; } ) ];
#TODO: users.users.root.openssh.authorizedKeys.keys #TODO: users.users.root.openssh.authorizedKeys.keys
programs.ssh.knownHosts.${buildMachine.hostName}.publicKey = publicKey; programs.ssh.knownHosts.${buildMachine.hostName}.publicKey = publicKey;
# the timeout is great to have when a remote is unresponsive, as nix currently does not give a shit # the timeout is great to have when a remote is unresponsive, as nix currently does not give a shit