diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index c2b714d7c26..5a20f6413b1 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -28,7 +28,7 @@ let
${cfg.extraConfig}
'';
- allConfigPaths = [configFile] ++ cfg.extraConfigPaths;
+ allConfigPaths = [configFile] ++ cfg.extraSettingsPaths;
configOptions = escapeShellArgs (concatMap (p: ["-config" p]) allConfigPaths);
@@ -95,7 +95,7 @@ in
Confidential values should not be specified here because this option's
value is written to the Nix store, which is publicly readable.
Provide credentials and such in a separate file using
- .
+ .
'';
};
@@ -111,7 +111,7 @@ in
description = "Extra text appended to vault.hcl.";
};
- extraConfigPaths = mkOption {
+ extraSettingsPaths = mkOption {
type = types.listOf types.path;
default = [];
description = ''
@@ -134,7 +134,7 @@ in
${"''"};
user = "vault";
};
- services.vault.extraConfigPaths = ["/run/keys/vault.hcl"];
+ services.vault.extraSettingsPaths = ["/run/keys/vault.hcl"];
services.vault.storageBackend = "postgresql";
users.users.vault.extraGroups = ["keys"];
]]>
diff --git a/nixos/tests/vault-postgresql.nix b/nixos/tests/vault-postgresql.nix
index 185a9515d61..daa71976338 100644
--- a/nixos/tests/vault-postgresql.nix
+++ b/nixos/tests/vault-postgresql.nix
@@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
environment.systemPackages = [ pkgs.vault ];
environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
services.vault.enable = true;
- services.vault.extraConfigPaths = [ "/run/vault.hcl" ];
+ services.vault.extraSettingsPaths = [ "/run/vault.hcl" ];
systemd.services.vault = {
after = [