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

nixos/vault: extraConfigPaths -> extraSettingsPaths

Browse Source 
Align with RFC42 language, even if in advance of the actual settings
attribute.
This commit is contained in:
Robert Hensing 2021-01-19 18:14:29 +01:00
parent 653f18b48f
commit 04946f4246
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/security/vault.nix
View File

@ -28,7 +28,7 @@ let
${cfg.extraConfig} ${cfg.extraConfig}
''; '';
allConfigPaths = [configFile] ++ cfg.extraConfigPaths; allConfigPaths = [configFile] ++ cfg.extraSettingsPaths;
configOptions = escapeShellArgs (concatMap (p: ["-config" p]) allConfigPaths); configOptions = escapeShellArgs (concatMap (p: ["-config" p]) allConfigPaths);
@ -95,7 +95,7 @@ in
Confidential values should not be specified here because this option's Confidential values should not be specified here because this option's
value is written to the Nix store, which is publicly readable. value is written to the Nix store, which is publicly readable.
Provide credentials and such in a separate file using Provide credentials and such in a separate file using
<xref linkend="opt-services.vault.extraConfigPaths"/>. <xref linkend="opt-services.vault.extraSettingsPaths"/>.
''; '';
}; };
@ -111,7 +111,7 @@ in
description = "Extra text appended to <filename>vault.hcl</filename>."; description = "Extra text appended to <filename>vault.hcl</filename>.";
}; };
extraConfigPaths = mkOption { extraSettingsPaths = mkOption {
type = types.listOf types.path; type = types.listOf types.path;
default = []; default = [];
description = '' description = ''
@ -134,7 +134,7 @@ in
${"''"}; ${"''"};
user = "vault"; user = "vault";
}; };
services.vault.extraConfigPaths = ["/run/keys/vault.hcl"]; services.vault.extraSettingsPaths = ["/run/keys/vault.hcl"];
services.vault.storageBackend = "postgresql"; services.vault.storageBackend = "postgresql";
users.users.vault.extraGroups = ["keys"]; users.users.vault.extraGroups = ["keys"];
]]></programlisting> ]]></programlisting>

2
nixos/tests/vault-postgresql.nix
View File

@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
environment.systemPackages = [ pkgs.vault ]; environment.systemPackages = [ pkgs.vault ];
environment.variables.VAULT_ADDR = "http://127.0.0.1:8200"; environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
services.vault.enable = true; services.vault.enable = true;
services.vault.extraConfigPaths = [ "/run/vault.hcl" ]; services.vault.extraSettingsPaths = [ "/run/vault.hcl" ];
systemd.services.vault = { systemd.services.vault = {
after = [ after = [