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

nixos/nomad: move serviceConfig into mkMerge and mkIf for docker SupplementaryGroups

Browse Source
This commit is contained in:
Phillip Cloud 2021-01-18 09:05:59 -05:00
parent f3aa71b7ec
commit 58fe45936e
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/services/networking/nomad.nix
View File

@ -122,7 +122,8 @@ in
iptables iptables
]); ]);
serviceConfig = { serviceConfig = mkMerge [
{
DynamicUser = cfg.dropPrivileges; DynamicUser = cfg.dropPrivileges;
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
ExecStart = "${cfg.package}/bin/nomad agent -config=/etc/nomad.json" + ExecStart = "${cfg.package}/bin/nomad agent -config=/etc/nomad.json" +
@ -138,9 +139,9 @@ in
StateDirectory = "nomad"; StateDirectory = "nomad";
TasksMax = "infinity"; TasksMax = "infinity";
User = optionalString cfg.dropPrivileges "nomad"; User = optionalString cfg.dropPrivileges "nomad";
} // (optionalAttrs cfg.enableDocker { }
SupplementaryGroups = "docker"; # space-separated string (mkIf cfg.enableDocker { SupplementaryGroups = "docker"; }) # space-separated string
}); ];
unitConfig = { unitConfig = {
StartLimitIntervalSec = 10; StartLimitIntervalSec = 10;