Get API port from pihole-FTL.conf instead of port file #260
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
Signed-off-by: Christian König <ckoenig@posteo.de>
Merged
dschaper
approved these changes
Sep 30, 2022
|
|
||
| if [ -s "$FTLCONFFILE" ]; then | ||
| # if FTLPORT is not set in pihole-FTL.conf, use the default port | ||
| ftl_api_port="$({ grep '^FTLPORT=' "${FTLCONFFILE}" || echo "${DEFAULT_FTL_PORT}"; } | cut -d'=' -f2-)" |
There was a problem hiding this comment.
Gut feeling says there is a better way than piping echo to cut but that may involve sed/awk and that's not something to wish upon a friend!
There was a problem hiding this comment.
We use the same code in a few places in core. The echo pipe could be circumvented with something like
ftl_api_port="$(grep '^FTLPORT=' "${FTLCONFFILE}" | cut -d'=' -f2-)"
if [ -z "${ftl_api_port}" ]; then
ftl_api_port="${DEFAULT_FTL_PORT}"
fi
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.
What does this PR aim to accomplish?:
We removed the
pihole-FTL.portfile here: pi-hole/FTL#1445.The file was used by
PADDto get the current API port to communicate withFTL.With this PR
PADDnow tries to read the port frompihole-FTL.confthe same as we do it in pi-hole/pi-hole#4945By submitting this pull request, I confirm the following:
git rebase)