Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Vault: fix config when file backend is used #72787

Merged
merged 2 commits into from
Nov 5, 2019
Merged

Vault: fix config when file backend is used #72787

merged 2 commits into from
Nov 5, 2019

Conversation

jpotier
Copy link
Contributor

@jpotier jpotier commented Nov 4, 2019 •
edited
Loading

When the option services.vault.storageBackend is set to "file", a
systemd.tmpfiles.rules was added, with extraneous []. These are not
needed and have been removed.

Fixes issue #72786

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @volth, @aanderse, @endocrimes, @LnL7, @flokli

@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 4, 2019
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 4, 2019
MasseR
MasseR approved these changes Nov 4, 2019
View reviewed changes
Copy link
Contributor

@MasseR MasseR left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

I identified this same problem on my machine and verified with a similar fix.

endocrimes
endocrimes approved these changes Nov 5, 2019
View reviewed changes
Copy link
Member

@endocrimes endocrimes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

jpotier and others added 2 commits November 5, 2019 16:54
@jpotier @flokli
vault: fix config when file backend is used
9b78e5f 
When the option services.vault.storageBackend is set to "file", a
systemd.tmpfiles.rules was added, with extraneous []. These are not
needed and have been removed.
@flokli
nixos/vault: convert test to python
5fecc35
@flokli
Copy link
Contributor

flokli commented Nov 5, 2019

rebased on latest master and converted vault vm test to python /cc #72828

@flokli
Copy link
Contributor

flokli commented Nov 5, 2019

@GrahamcOfBorg test vault

@flokli
Copy link
Contributor

flokli commented Nov 5, 2019

ran tests manually.

@flokli flokli merged commit 2cb12e0 into NixOS:master Nov 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MasseR MasseR MasseR approved these changes

@endocrimes endocrimes endocrimes approved these changes

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jpotier @flokli @MasseR @endocrimes