c3d2/nix-config
c3d2
/
nix-config
24
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

Hail fixup

This commit is contained in:
Ehmry - 2020-01-20 16:48:20 +01:00
parent 0878859b17
commit 84e7a38024
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hosts/hydra/hydra.nix
View File

@ -5,15 +5,13 @@
binaryCaches = [ "https://cache.nixos.org" "https://cache.dhall-lang.org" ]; binaryCaches = [ "https://cache.nixos.org" "https://cache.dhall-lang.org" ];
binaryCachePublicKeys = binaryCachePublicKeys =
[ "cache.dhall-lang.org:I9/H18WHd60olG5GsIjolp7CtepSgJmM2CsO813VTmM=" ]; [ "cache.dhall-lang.org:I9/H18WHd60olG5GsIjolp7CtepSgJmM2CsO813VTmM=" ];
buildMachines = [ buildMachines = [{
{ hostName = "server7.hq.c3d2.de";
hostName = "server7.hq.c3d2.de"; system = "x86_64-linux";
system = "x86_64-linux"; sshUser = "buildfarmer";
sshUser = "buildfarmer"; sshKey = "/root/.ssh/id_ed25519";
sshKey = "/root/.ssh/id_ed25519"; maxJobs = 10;
maxJobs = 10; }];
}
];
extraOptions = '' extraOptions = ''
allowed-uris = http:// https:// allowed-uris = http:// https://
''; '';
@ -31,13 +29,11 @@
enable = true; enable = true;
recommendedProxySettings = true; recommendedProxySettings = true;
recommendedGzipSettings = true; recommendedGzipSettings = true;
virtualHosts = { virtualHosts."hydra.hq.c3d2.de" = {
"hydra.hq.c3d2.de" = { forceSSL = true;
forceSSL = true; enableACME = true;
enableACME = true; locations."/".proxyPass =
locations."/".proxyPass = "http://localhost:${toString config.services.hydra.port}";
"http://localhost:${toString config.services.hydra.port}";
};
}; };
}; };
} }

3
lib/default.nix
View File

@ -218,8 +218,7 @@ in {
services.hail = lib.mkIf cfg.enableHail { services.hail = lib.mkIf cfg.enableHail {
enable = true; enable = true;
hydraJobUri = hydraJobUri =
let hydra = if cfg.mapHqHosts then "hydra.hq" else "hydra.hq.c3d2.de"; "https://hydra.hq.c3d2.de/job/c3d2/hail/${config.networking.hostName}-activator ";
in "https:///${hydra}/job/c3d2/hail/${config.networking.hostName}-activator ";
# pad the end so the URL doesn't break when systemshit puts a ; on the end # pad the end so the URL doesn't break when systemshit puts a ; on the end
package = (import <nixpkgs-unstable> { }).haskellPackages.hail; package = (import <nixpkgs-unstable> { }).haskellPackages.hail;
# Only builds > 19.09 # Only builds > 19.09