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

Merge pull request #72787 from jpotier/master

Browse Source 
Vault: fix config when file backend is used
This commit is contained in:
Florian Klink 2019-11-05 16:59:32 +01:00 committed by GitHub
commit 2cb12e0eaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,9 +119,8 @@ in
}; };
users.groups.vault.gid = config.ids.gids.vault; users.groups.vault.gid = config.ids.gids.vault;
systemd.tmpfiles.rules = optional (cfg.storagePath != null) [ systemd.tmpfiles.rules = optional (cfg.storagePath != null)
"d '${cfg.storagePath}' 0700 vault vault - -" "d '${cfg.storagePath}' 0700 vault vault - -";
];
systemd.services.vault = { systemd.services.vault = {
description = "Vault server daemon"; description = "Vault server daemon";

14
nixos/tests/vault.nix
View File

@ -1,4 +1,4 @@
import ./make-test.nix ({ pkgs, ... }: import ./make-test-python.nix ({ pkgs, ... }:
{ {
name = "vault"; name = "vault";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.stdenv.lib.maintainers; {
@ -12,12 +12,12 @@ import ./make-test.nix ({ pkgs, ... }:
testScript = testScript =
'' ''
startAll; start_all()
$machine->waitForUnit('multi-user.target'); machine.wait_for_unit("multi-user.target")
$machine->waitForUnit('vault.service'); machine.wait_for_unit("vault.service")
$machine->waitForOpenPort(8200); machine.wait_for_open_port(8200)
$machine->succeed('vault operator init'); machine.succeed("vault operator init")
$machine->succeed('vault status | grep Sealed | grep true'); machine.succeed("vault status | grep Sealed | grep true")
''; '';
}) })