Merge pull request #17469 from ericsagnes/module/hydra

Improvements to Hydra module

Changed files
+7 -2
nixos
modules
services
continuous-integration
hydra
+7 -2
nixos/modules/services/continuous-integration/hydra/default.nix
···
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.";
};
···
config = mkIf cfg.enable {
-
users.extraGroups.hydra = { };
+
users.extraGroups.hydra = {
+
gid = config.ids.gids.hydra;
+
};
users.extraUsers.hydra =
{ description = "Hydra";
···
createHome = true;
home = baseDir;
useDefaultShell = true;
+
uid = config.ids.uids.hydra;
};
users.extraUsers.hydra-queue-runner =
···
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" ];