nixos/services.vault-agent: fix ExecStart generation when a vault package is set #384031
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…kage is set Without this fix, if `config.services.vault.package` is set to e.g. `vault-bin` (instead of the `vault` default), then `ExecStart` gets improperly generated without the `agent` positional argument because `vault-bin` did not match `vault`, and the command for the `consul` flavor gets generated instead. To fix this, we can look at the `flavor` argument instead of the package name.
github-actions
bot
added
6.topic: nixos
|
@emilylange & @tcheronneau for review, thank you 🙏. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Without this fix, if
config.services.vault.packageis set to e.g.vault-bin(instead of thevaultdefault), thenExecStartgets improperly generated without theagentpositional argument becausevault-bindid not matchvault, and the command for theconsulflavor gets generated instead.To fix this, we can look at the
flavorargument instead of the package name.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.