treewide: rationalise distributed builds
This commit is contained in:
parent
b25aa75d37
commit
05864180db
|
@ -22,12 +22,10 @@ in
|
|||
qenya.services.remote-builder = {
|
||||
enable = true;
|
||||
authorizedKeys.keys = [
|
||||
keys.machines.kilgharrah
|
||||
keys.machines.tohru
|
||||
keys.machines.yevaud
|
||||
keys.machines.orm
|
||||
];
|
||||
};
|
||||
boot.binfmt.emulatedSystems = [ "x86_64-linux" ];
|
||||
|
||||
system.stateVersion = "23.11";
|
||||
}
|
||||
|
|
|
@ -40,11 +40,12 @@ in
|
|||
|
||||
qenya.services.remote-builder = {
|
||||
enable = true;
|
||||
authorizedKeys.keys = [
|
||||
keys.machines.tohru
|
||||
keys.machines.yevaud
|
||||
keys.machines.orm
|
||||
];
|
||||
authorizedKeys.keys = [ keys.machines.tohru ];
|
||||
};
|
||||
qenya.services.distributed-builds = {
|
||||
enable = true;
|
||||
keyFile = "/etc/ssh/ssh_host_ed25519_key";
|
||||
builders = [ "kalessin" ];
|
||||
};
|
||||
|
||||
programs.steam.enable = true;
|
||||
|
|
|
@ -14,12 +14,6 @@
|
|||
users.users.qenya.extraGroups = [ "wheel" ];
|
||||
qenya.base-server.enable = true;
|
||||
|
||||
qenya.services.distributed-builds = {
|
||||
enable = true;
|
||||
keyFile = "/etc/ssh/ssh_host_ed25519_key";
|
||||
builders = [ "kalessin" ];
|
||||
};
|
||||
|
||||
randomcat.services.zfs.datasets = {
|
||||
"rpool_orm/state" = { mountpoint = "none"; };
|
||||
"rpool_orm/state/actual" = { mountpoint = "/var/lib/actual"; };
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
qenya.services.distributed-builds = {
|
||||
enable = true;
|
||||
keyFile = "/etc/ssh/ssh_host_ed25519_key";
|
||||
builders = [ "kalessin" ];
|
||||
builders = [ "kilgharrah" "kalessin" ];
|
||||
};
|
||||
|
||||
programs.evolution.enable = true; # not in home-manager yet; not declaratively configurable yet
|
||||
|
|
|
@ -14,12 +14,6 @@
|
|||
users.users.qenya.extraGroups = [ "wheel" ];
|
||||
qenya.base-server.enable = true;
|
||||
|
||||
qenya.services.distributed-builds = {
|
||||
enable = true;
|
||||
keyFile = "/etc/ssh/ssh_host_ed25519_key";
|
||||
builders = [ "kalessin" ];
|
||||
};
|
||||
|
||||
services.bind = {
|
||||
# enable = true;
|
||||
cacheNetworks = [ "10.127.0.0/16" "fd70:81ca:0f8f::/48" ];
|
||||
|
|
|
@ -38,8 +38,17 @@ in
|
|||
hostName = config.birdsong.hosts."kalessin".ipv4;
|
||||
sshUser = "remotebuild";
|
||||
sshKey = cfg.keyFile;
|
||||
systems = [ "aarch64-linux" "x86_64-linux" ];
|
||||
supportedFeatures = [ ];
|
||||
systems = [ "aarch64-linux" ];
|
||||
maxJobs = 2;
|
||||
supportedFeatures = [ "big-parallel" ];
|
||||
})
|
||||
++ (optional (elem "kilgharrah" cfg.builders) {
|
||||
hostName = config.birdsong.hosts."kilgharrah".ipv4;
|
||||
sshUser = "remotebuild";
|
||||
sshKey = cfg.keyFile;
|
||||
systems = [ "x86_64-linux" ];
|
||||
maxJobs = 12;
|
||||
supportedFeatures = [ "big-parallel" ];
|
||||
});
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue