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

Do not restart for every item during Teleporter import of Local DNS record or CNAME #1925

Merged
merged 4 commits into from
Oct 23, 2021

Conversation

yubiuser
Copy link
Member

@yubiuser yubiuser commented Oct 12, 2021

  • 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?:

Do not restart Pi-hole for every entry in local DNS records or CNAME during Teleporter import.
So far, Pi-hole did a full restart while deleting each individual entry (if clear data was selected) and on each entry import.
Fixes: https://github.com/pi-hole/pi-hole/issues/4077

Needs: pi-hole/pi-hole#4384

How?
Adds a flag "reload" which is passed down to the webpage.sh. For each step it is set to false. After all removal/importing is done, it sets the new variable fullpiholerestart to true which will finally do the full restart

@yubiuser yubiuser marked this pull request as ready for review October 13, 2021 18:54
Signed-off-by: yubiuser <[email protected]>
Copy link
Member

@DL6ER DL6ER left a comment

Choose a reason for hiding this comment

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

Only merge when pi-hole/pi-hole#4384 is merged

@DL6ER DL6ER merged commit 9ab9850 into devel Oct 23, 2021
@DL6ER DL6ER deleted the tweak/local_dns_cname branch October 23, 2021 14:39
@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-11-web-v5-8-and-core-v5-6-released/50566/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: Code Review Required Open Pull Request, needs code reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Teleporter restore concatenates custom.list instead of replacing despite checking "clear data"
3 participants