hosts/hydra: upgrade to 20.03, use server7 builder
This commit is contained in:
parent
ac0bc652c5
commit
b390162f36
|
@ -22,6 +22,10 @@
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
|
security.acme = {
|
||||||
|
email = "mail@c3d2.de";
|
||||||
|
acceptTerms = true;
|
||||||
|
};
|
||||||
security.pam.enableSSHAgentAuth = true;
|
security.pam.enableSSHAgentAuth = true;
|
||||||
|
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
|
|
|
@ -15,8 +15,11 @@
|
||||||
allowed-uris = http:// https://
|
allowed-uris = http:// https://
|
||||||
'';
|
'';
|
||||||
buildMachines = [{
|
buildMachines = [{
|
||||||
hostName = "localhost";
|
hostName = "server7.hq";
|
||||||
|
sshUser = "hydra";
|
||||||
|
sshKey = "/var/lib/hydra/queue-runner/id_rsa";
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
speedFactor = 2;
|
||||||
supportedFeatures = [ "kvm" "nixos-test" "big-parallel" "benchmark" ];
|
supportedFeatures = [ "kvm" "nixos-test" "big-parallel" "benchmark" ];
|
||||||
maxJobs = 8;
|
maxJobs = 8;
|
||||||
}];
|
}];
|
||||||
|
@ -27,6 +30,7 @@
|
||||||
hydraURL = "https://hydra.hq.c3d2.de";
|
hydraURL = "https://hydra.hq.c3d2.de";
|
||||||
logo = ./c3d2.svg;
|
logo = ./c3d2.svg;
|
||||||
notificationSender = "hydra@spam.works";
|
notificationSender = "hydra@spam.works";
|
||||||
|
package = pkgs.hydra-unstable;
|
||||||
useSubstitutes = false;
|
useSubstitutes = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -154,4 +154,9 @@ in {
|
||||||
time.timeZone = "Europe/Berlin";
|
time.timeZone = "Europe/Berlin";
|
||||||
|
|
||||||
system.stateVersion = "19.09"; # Did you read the comment?
|
system.stateVersion = "19.09"; # Did you read the comment?
|
||||||
|
|
||||||
|
users.extraUsers.hydra.openssh.authorizedKeys.keys = [
|
||||||
|
# allow the old hydra to build here
|
||||||
|
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7HuDlyTlPC4rCjwhklY8kiYIxdgPhiu6wxs29ksnpKZmJa2R7qoD02N3ACm9cTb1GVkIWukAXI3KvU9h08+WLQJqUH0cHVBj3V1sDYmkN2QecE59gz3e1gfN3zPtwmQEUe6xvHWK3X3qdH45pGPUtxk1eDTZl45037C0NClWF7RXI4m6UXng4bL9wnPvoVqCI+ySsNWaTkHDLE/D9s/VrqGxJ1w2KiJb1F73g9/x/zjL8Ixb16wkPmLE0e50MQAQa7EMFTyPZoEskFnEviLYXM9pDexABAjJfbfZ39lLyMgVYGwnzEDbjDlm68dE6wQWUY1OV6wbt8uYreB2IRrlb root@hydra"
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue