diff options
| author | Domen Kožar <domen@dev.si> | 2016-08-20 19:50:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-20 19:50:50 +0200 |
| commit | acaa6a4c2b0ef4d73f5e4b38302f310072e4c9b1 (patch) | |
| tree | 82ef46e366ff1cd9733830a92cb0c6c07aa699c0 /nixos/modules/services/continuous-integration | |
| parent | 2e9a3c363653ccde9b164c39349962b1d55078c8 (diff) | |
| parent | 338c425e081ef078749c5a68fa880347ac0bade6 (diff) | |
| download | nixpkgs-acaa6a4c2b0ef4d73f5e4b38302f310072e4c9b1.tar nixpkgs-acaa6a4c2b0ef4d73f5e4b38302f310072e4c9b1.tar.gz nixpkgs-acaa6a4c2b0ef4d73f5e4b38302f310072e4c9b1.tar.bz2 nixpkgs-acaa6a4c2b0ef4d73f5e4b38302f310072e4c9b1.tar.lz nixpkgs-acaa6a4c2b0ef4d73f5e4b38302f310072e4c9b1.tar.xz nixpkgs-acaa6a4c2b0ef4d73f5e4b38302f310072e4c9b1.tar.zst nixpkgs-acaa6a4c2b0ef4d73f5e4b38302f310072e4c9b1.zip | |
Merge pull request #17469 from ericsagnes/module/hydra
Improvements to Hydra module
Diffstat (limited to 'nixos/modules/services/continuous-integration')
| -rw-r--r-- | nixos/modules/services/continuous-integration/hydra/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index c8edfaf1853..b1b3404add0 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -166,7 +166,7 @@ in buildMachinesFiles = mkOption { type = types.listOf types.path; - default = []; + default = [ "/etc/nix/machines" ]; example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ]; description = "List of files containing build machines."; }; @@ -193,7 +193,9 @@ in config = mkIf cfg.enable { - users.extraGroups.hydra = { }; + users.extraGroups.hydra = { + gid = config.ids.gids.hydra; + }; users.extraUsers.hydra = { description = "Hydra"; @@ -201,6 +203,7 @@ in createHome = true; home = baseDir; useDefaultShell = true; + uid = config.ids.uids.hydra; }; users.extraUsers.hydra-queue-runner = @@ -208,12 +211,14 @@ in group = "hydra"; useDefaultShell = true; home = "${baseDir}/queue-runner"; # really only to keep SSH happy + uid = config.ids.uids.hydra-queue-runner; }; users.extraUsers.hydra-www = { description = "Hydra web server"; group = "hydra"; useDefaultShell = true; + uid = config.ids.uids.hydra-www; }; nix.trustedUsers = [ "hydra-queue-runner" ]; |