nixos/kibana: add passwordFile option (#24288) #30662
Closed
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
75 tasks
schneefux
force-pushed
the
module.kibana
branch
2 times, most recently
from
deb7c56
to
4fecf6d
Compare
|
Tested & fixed the expression producing an error when no password was set. |
schneefux
force-pushed
the
module.kibana
branch
from
4fecf6d
to
268325e
Compare
schneefux
commented
Oct 22, 2017
| ''} | ||
| ${optionalString (cfg.elasticsearch.passwordFile != null) '' | ||
| ELASTIC_PASSWORD=$(head -n1 ${cfg.elasticsearch.passwordFile}) | ||
| sed -e "s,PASSWORD_REPLACED_PRESTART,$ELASTIC_PASSWORD,g" -i ${cfgFileRun} |
There was a problem hiding this comment.
This fails if there are special characters like " in the password. Is there a better approach?
There was a problem hiding this comment.
I don't think this will fail, bash doesn't interpret the quotes in an expanded string.
infinisil
requested changes
Feb 10, 2018
| ${optionalString (cfg.elasticsearch.passwordFile == null) '' | ||
| sed -e 's,"password":"PASSWORD_REPLACED_PRESTART"\,,,g' -i ${cfgFileRun} | ||
| ''} | ||
| ${optionalString (cfg.elasticsearch.passwordFile != null) '' |
There was a problem hiding this comment.
Use
if (cfg.elasticsearch.passwordFile == null) then ''
sed ...
'' else ''
ELASTIC_PASSWORD=...
''instead
| ''} | ||
| ${optionalString (cfg.elasticsearch.passwordFile != null) '' | ||
| ELASTIC_PASSWORD=$(head -n1 ${cfg.elasticsearch.passwordFile}) | ||
| sed -e "s,PASSWORD_REPLACED_PRESTART,$ELASTIC_PASSWORD,g" -i ${cfgFileRun} |
There was a problem hiding this comment.
I don't think this will fail, bash doesn't interpret the quotes in an expanded string.
|
Ping |
matthewbauer
requested changes
Apr 21, 2018
|
Sorry, I am no longer using Kibana on NixOS so I cannot maintain this pull request. If anyone wants to take over, please do! |
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
Added a warning if the elasticsearch password is stored in the nix store, added the
passwordFileoption to be used instead.Tested Kibana 5 by looking at the generated
/var/lib/kibana/config.json, once with thepasswordoption set and once using thepasswordFileoption.Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)