diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2021-01-19 18:14:29 +0100 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2021-01-19 18:14:29 +0100 |
| commit | 04946f42468a8698c0c42aad9086c4671949916a (patch) | |
| tree | 51241197c7535304e691815a082d16c9d832be7f | |
| parent | 653f18b48fa6bd6b3e51a05c8ca0d93042c19785 (diff) | |
| download | nixpkgs-04946f42468a8698c0c42aad9086c4671949916a.tar nixpkgs-04946f42468a8698c0c42aad9086c4671949916a.tar.gz nixpkgs-04946f42468a8698c0c42aad9086c4671949916a.tar.bz2 nixpkgs-04946f42468a8698c0c42aad9086c4671949916a.tar.lz nixpkgs-04946f42468a8698c0c42aad9086c4671949916a.tar.xz nixpkgs-04946f42468a8698c0c42aad9086c4671949916a.tar.zst nixpkgs-04946f42468a8698c0c42aad9086c4671949916a.zip | |
nixos/vault: extraConfigPaths -> extraSettingsPaths
Align with RFC42 language, even if in advance of the actual settings attribute.
| -rw-r--r-- | nixos/modules/services/security/vault.nix | 8 | ||||
| -rw-r--r-- | nixos/tests/vault-postgresql.nix | 2 |
2 files changed, 5 insertions, 5 deletions
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 - <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>."; }; - 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"]; ]]></programlisting> 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 = [ |