Merge pull request #78358 from serokell/yorickvp/alertmanager-secret #78358
+19
−2
Conversation
This file contains hidden or 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
ofborg
bot
added
6.topic: nixos
infinisil
requested changes
Jan 23, 2020
infinisil
approved these changes
Jan 24, 2020
infinisil
changed the title
grahamc
reviewed
Jan 24, 2020
| @@ -127,6 +127,18 @@ in { | |||
| Extra commandline options when launching the Alertmanager. | |||
| ''; | |||
| }; | |||
|
|
|||
| environmentFile = mkOption { | |||
| type = types.nullOr types.path; | |||
There was a problem hiding this comment.
Are there concerns around this being added to the store?
There was a problem hiding this comment.
I checked, it won't be added to the store even when set with environmentFile = ./local/file due to how systemd.services.*.serviceConfig is implemented.
grahamc
reviewed
Jan 24, 2020
| @@ -144,9 +156,14 @@ in { | |||
| systemd.services.alertmanager = { | |||
| wantedBy = [ "multi-user.target" ]; | |||
| after = [ "network.target" ]; | |||
| preStart = '' | |||
| ${lib.getBin pkgs.envsubst}/bin/envsubst -o /tmp/alert-manager-substituted.yaml" \ | |||
There was a problem hiding this comment.
We might want to set a umask here, and also below explicitly enable PrivateTmp instead of depending on the implied PrivateTemp.
dtzWill
pushed a commit
to dtzWill/nixpkgs
that referenced
this pull request
Jan 24, 2020
…cret nixos/alertmanager: add environmentFile, envsubst for secrets (cherry picked from commit 342bc51)
ghost
mentioned this pull request
10 tasks
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.
Motivation for this change
Alertmanager has secret inputs, like mail passwords. Let's use
envsubstto substitute environment variables into the yaml config.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)