Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass config file path when reloading pihole-FTL.conf #2183

Merged
merged 2 commits into from
Apr 24, 2022
Merged

Conversation

yubiuser
Copy link
Member

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)
  • I have Signed Off all commits. (git commit --signoff)

What does this PR aim to accomplish?:

Fixes #1783

PR #2130 added the flag force to the piholeFTLConfig function that forces the page to re-read the config file on reload if true was passed. This fixed #1783 already.
However, #2126 added a second argument (the config file path) without passing two arguments to piholeFTLConfig. So the forced reload was never happening, which re-introduced #1783.

This PR solves this by simply passing the default config file path to piholeFTLConfig

Signed-off-by: Christian König <ckoenig@posteo.de>
settings.php Outdated Show resolved Hide resolved
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser yubiuser merged commit c5cc703 into devel Apr 24, 2022
@yubiuser yubiuser deleted the reload/privacy branch April 24, 2022 05:43
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-ftl-v5-16-web-v5-13-and-core-v5-11-1-released/56384/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants