movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

nixos/services.vault-agent: remove with lib;

Browse source
This commit is contained in:
Felix Buehler 2024-12-29 21:50:39 +01:00
parent 4bcc603cd8
commit 10e015d823
1 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

37
nixos/modules/services/security/vault-agent.nix
View file

@ -4,9 +4,6 @@
pkgs,
...
}:
with lib;
let
format = pkgs.formats.json { };
commonOptions =
@ -14,26 +11,26 @@ let
pkgName,
flavour ? pkgName,
}:
mkOption {
lib.mkOption {
default = { };
description = ''
Attribute set of ${flavour} instances.
Creates independent `${flavour}-''${name}.service` systemd units for each instance defined here.
'';
type =
with types;
with lib.types;
attrsOf (
submodule (
{ name, ... }:
{
options = {
enable = mkEnableOption "this ${flavour} instance" // {
enable = lib.mkEnableOption "this ${flavour} instance" // {
default = true;
};
package = mkPackageOption pkgs pkgName { };
package = lib.mkPackageOption pkgs pkgName { };
user = mkOption {
user = lib.mkOption {
type = types.str;
default = "root";
description = ''
@ -41,7 +38,7 @@ let
'';
};
group = mkOption {
group = lib.mkOption {
type = types.str;
default = "root";
description = ''
@ -49,12 +46,12 @@ let
'';
};
settings = mkOption {
settings = lib.mkOption {
type = types.submodule {
freeformType = format.type;
options = {
pid_file = mkOption {
pid_file = lib.mkOption {
default = "/run/${flavour}/${name}.pid";
type = types.str;
description = ''
@ -62,7 +59,7 @@ let
'';
};
template = mkOption {
template = lib.mkOption {
default = null;
type = with types; nullOr (listOf (attrsOf anything));
description =
@ -116,7 +113,7 @@ let
let
configFile = format.generate "${name}.json" instance.settings;
in
mkIf (instance.enable) {
lib.mkIf (instance.enable) {
description = "${flavour} daemon - ${name}";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
@ -127,8 +124,8 @@ let
User = instance.user;
Group = instance.group;
RuntimeDirectory = flavour;
ExecStart = "${getExe instance.package} ${
optionalString ((getName instance.package) == "vault") "agent"
ExecStart = "${lib.getExe instance.package} ${
lib.optionalString ((lib.getName instance.package) == "vault") "agent"
} -config ${configFile}";
ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID";
KillSignal = "SIGINT";
@ -146,17 +143,17 @@ in
};
};
config = mkMerge (
config = lib.mkMerge (
map
(
flavour:
let
cfg = config.services.${flavour};
in
mkIf (cfg.instances != { }) {
systemd.services = mapAttrs' (
lib.mkIf (cfg.instances != { }) {
systemd.services = lib.mapAttrs' (
name: instance:
nameValuePair "${flavour}-${name}" (createAgentInstance {
lib.nameValuePair "${flavour}-${name}" (createAgentInstance {
inherit name instance flavour;
})
) cfg.instances;
@ -168,7 +165,7 @@ in
]
);
meta.maintainers = with maintainers; [
meta.maintainers = with lib.maintainers; [
emilylange
tcheronneau
];