sercanto/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge

Browse source 
361: misc cleanups r=Mic92 a=zowoq



Co-authored-by: zowoq <59103226+zowoq@users.noreply.github.com>
This commit is contained in:
bors[bot] 2023-01-05 08:10:38 +00:00 • committed by GitHub
commit cabcb9eea0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 3 deletions

3
build01/configuration.nix
View file

@ -25,9 +25,6 @@
networking.hostName = "build01"; networking.hostName = "build01";
networking.hostId = "d2905767"; networking.hostId = "d2905767";
# Emulate armv7 until we have proper builders
boot.binfmt.emulatedSystems = [ "armv7l-linux" ];
systemd.network.networks."10-uplink".networkConfig.Address = "2a01:4f8:13b:2ceb::1/64"; systemd.network.networks."10-uplink".networkConfig.Address = "2a01:4f8:13b:2ceb::1/64";
system.stateVersion = "20.03"; system.stateVersion = "20.03";

1
roles/remote-builder/aarch64-build04.nix
View file

@ -5,6 +5,7 @@
{ {
hostName = "build04.nix-community.org"; hostName = "build04.nix-community.org";
maxJobs = 4; maxJobs = 4;
protocol = "ssh"; # this machine is used by hydra which doesn't support ssh-ng
sshKey = config.sops.secrets.id_buildfarm.path; sshKey = config.sops.secrets.id_buildfarm.path;
sshUser = "nix"; sshUser = "nix";
system = "aarch64-linux"; system = "aarch64-linux";

1
roles/remote-builder/aarch64-nixos-community.nix
View file

@ -5,6 +5,7 @@
{ {
hostName = "aarch64.nixos.community"; hostName = "aarch64.nixos.community";
maxJobs = 64; maxJobs = 64;
protocol = "ssh-ng";
sshKey = config.sops.secrets.aarch64_nixos_community.path; sshKey = config.sops.secrets.aarch64_nixos_community.path;
sshUser = "nixcommunity"; sshUser = "nixcommunity";
system = "aarch64-linux"; system = "aarch64-linux";