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

Reset config values after env forcing #1979

Merged
merged 6 commits into from
May 29, 2024
Merged

Reset config values after env forcing #1979

merged 6 commits into from
May 29, 2024

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented May 29, 2024

What does this implement/fix?

Reset config values to their default options if they have been forced through environment and are then unset.


Related issue or feature (if applicable): pi-hole/docker-pi-hole#1422

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.

DL6ER added 5 commits May 28, 2024 21:32
…ugh the environment

Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER requested a review from a team May 29, 2024 17:12
@DL6ER
Copy link
Member Author

DL6ER commented May 29, 2024

Note that the failed spellcheck will be fixed by #1962

Copy link
Member

@PromoFaux PromoFaux left a comment

Choose a reason for hiding this comment

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

Tested

@DL6ER DL6ER merged commit 60b1a75 into development-v6 May 29, 2024
17 checks passed
@DL6ER DL6ER deleted the tweak/env_reset branch May 29, 2024 17:57
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.

2 participants