public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17469 from ericsagnes/module/hydra

Browse Source 
Improvements to Hydra module
This commit is contained in:
Domen Kožar 2016-08-20 19:50:50 +02:00 committed by GitHub
commit acaa6a4c2b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/services/continuous-integration/hydra/default.nix
View File

@ -166,7 +166,7 @@ in
buildMachinesFiles = mkOption { buildMachinesFiles = mkOption {
type = types.listOf types.path; type = types.listOf types.path;
default = []; default = [ "/etc/nix/machines" ];
example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ]; example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ];
description = "List of files containing build machines."; description = "List of files containing build machines.";
}; };
@ -193,7 +193,9 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
users.extraGroups.hydra = { }; users.extraGroups.hydra = {
gid = config.ids.gids.hydra;
};
users.extraUsers.hydra = users.extraUsers.hydra =
{ description = "Hydra"; { description = "Hydra";
@ -201,6 +203,7 @@ in
createHome = true; createHome = true;
home = baseDir; home = baseDir;
useDefaultShell = true; useDefaultShell = true;
uid = config.ids.uids.hydra;
}; };
users.extraUsers.hydra-queue-runner = users.extraUsers.hydra-queue-runner =
@ -208,12 +211,14 @@ in
group = "hydra"; group = "hydra";
useDefaultShell = true; useDefaultShell = true;
home = "${baseDir}/queue-runner"; # really only to keep SSH happy home = "${baseDir}/queue-runner"; # really only to keep SSH happy
uid = config.ids.uids.hydra-queue-runner;
}; };
users.extraUsers.hydra-www = users.extraUsers.hydra-www =
{ description = "Hydra web server"; { description = "Hydra web server";
group = "hydra"; group = "hydra";
useDefaultShell = true; useDefaultShell = true;
uid = config.ids.uids.hydra-www;
}; };
nix.trustedUsers = [ "hydra-queue-runner" ]; nix.trustedUsers = [ "hydra-queue-runner" ];