nixos/nullmailer: fixes and remotesFile option
#29890
Merged
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
The current `remotes` option is a string option containing nullmailer remote definitions. However, those definitions may contain secret credentials and should therefore not be put world-readable in the nix store. I added a `remotesFile` option, which allows to specify a path to the remotes definition file instead. This way, the definitions can be kept outside of the nix store with more secure file permissions.
Mic92
reviewed
Sep 28, 2017
| attrs' = builtins.filter (attr: ! isNull (getval attr)) attrs; | ||
| in foldl' (as: attr: as // { "nullmailer/${attr}".text = getval attr; }) {} attrs'; | ||
| remotesFilter = if cfg.remotesFile != null | ||
| then (attr: attr != "remotes") |
There was a problem hiding this comment.
The assertion prevents this case already.
Mic92
changed the title
remotesFile optionremotesFile option
Mic92
reviewed
Sep 28, 2017
| (foldl' (as: attr: as // { "nullmailer/${attr}".text = getval attr; }) {} attrs') | ||
| // optionalRemotesFileLink; | ||
| (foldl' (as: name: as // { "nullmailer/${name}".text = validAttrs.${name}; }) {} (attrNames validAttrs)) | ||
| // optionalAttrs (cfg.remotesFile != null) { "nullmailer/remotes".source = cfg.remotesFile; }; |
There was a problem hiding this comment.
Can you check if it still works? My simple tests say yes.
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
Please see individual commit messages.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)