diff options
author | Aaron Andersen <aaron@fosslib.net> | 2021-11-21 13:45:25 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-21 13:45:25 -0500 |
commit | c9fde80d80e6b2d4f437305b91f20cce51d65332 (patch) | |
tree | 1e5e35acf7007c295769d1732a99b7a29e1e9533 /nixos | |
parent | e156e78d4b78c3f31ad032f77b84464771b7fca4 (diff) | |
parent | 6a1fdd60e6e74f7ae85a647eb7552fd9591640ab (diff) |
Merge pull request #146445 from GTrunSec/nomad
nixos/nomad: add flag of plugin-dir
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/networking/nomad.nix | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix index 3bd15bd5c808d..43333af5e2fea 100644 --- a/nixos/modules/services/networking/nomad.nix +++ b/nixos/modules/services/networking/nomad.nix @@ -51,7 +51,7 @@ in extraSettingsPaths = mkOption { type = types.listOf types.path; - default = []; + default = [ ]; description = '' Additional settings paths used to configure nomad. These can be files or directories. ''; @@ -60,9 +60,21 @@ in ''; }; + extraSettingsPlugins = mkOption { + type = types.listOf (types.either types.package types.path); + default = [ ]; + description = '' + Additional plugins dir used to configure nomad. + ''; + example = literalExpression '' + [ "<pluginDir>" "pkgs.<plugins-name>"] + ''; + }; + + settings = mkOption { type = format.type; - default = {}; + default = { }; description = '' Configuration for Nomad. See the <link xlink:href="https://www.nomadproject.io/docs/configuration">documentation</link> for supported values. @@ -128,7 +140,8 @@ in DynamicUser = cfg.dropPrivileges; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; ExecStart = "${cfg.package}/bin/nomad agent -config=/etc/nomad.json" + - concatMapStrings (path: " -config=${path}") cfg.extraSettingsPaths; + concatMapStrings (path: " -config=${path}") cfg.extraSettingsPaths + + concatMapStrings (path: " -plugin-dir=${path}/bin") cfg.extraSettingsPlugins; KillMode = "process"; KillSignal = "SIGINT"; LimitNOFILE = 65536; |