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

pihole -d: Include pihole.toml only once #5478

Merged
merged 1 commit into from
Nov 6, 2023
Merged

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Nov 6, 2023

What does this implement/fix?

Remove left-over parts of setupVars.conf processing and only include pihole.toml once


Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

…e.toml once

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER merged commit 834e52f into development-v6 Nov 6, 2023
14 checks passed
@DL6ER DL6ER deleted the debug/toml_twice branch November 6, 2023 18:46
Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please also remove

"${PIHOLE_WEB_SERVER_ACCESS_LOG_FILE}"
"${PIHOLE_WEB_SERVER_ERROR_LOG_FILE}"

@yubiuser
Copy link
Member

yubiuser commented Nov 6, 2023

I see... to late.

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

Successfully merging this pull request may close these issues.

None yet

3 participants