vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Make NIX_REMOTE_SYSTEMS configurable

Browse source
This commit is contained in:
Eelco Dolstra 2016-03-25 15:41:38 +01:00
parent ed88bbaac0
commit 74dfcc84e9
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hydra-module.nix
View file

@ -20,6 +20,7 @@ let
{ NIX_REMOTE = "daemon"; { NIX_REMOTE = "daemon";
SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt"; # Remove in 16.03 SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt"; # Remove in 16.03
PGPASSFILE = "${baseDir}/pgpass"; PGPASSFILE = "${baseDir}/pgpass";
NIX_REMOTE_SYSTEMS = concatStringsSep ":" cfg.buildMachinesFiles;
} // hydraEnv // cfg.extraEnv; } // hydraEnv // cfg.extraEnv;
serverEnv = env // serverEnv = env //
@ -149,6 +150,13 @@ in
default = "/nix/var/nix/gcroots/hydra"; default = "/nix/var/nix/gcroots/hydra";
description = "Directory that holds Hydra garbage collector roots."; description = "Directory that holds Hydra garbage collector roots.";
}; };
buildMachinesFiles = mkOption {
type = types.list types.path;
default = [];
example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ];
description = "List of files containing build machines.";
};
}; };
}; };
@ -311,6 +319,7 @@ in
{ ExecStart = "@${cfg.package}/bin/hydra-evaluator hydra-evaluator"; { ExecStart = "@${cfg.package}/bin/hydra-evaluator hydra-evaluator";
User = "hydra"; User = "hydra";
Restart = "always"; Restart = "always";
WorkingDirectory = baseDir;
}; };
}; };