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

Migrate dnsmasq config files #5479

Merged
merged 5 commits into from May 12, 2024
Merged

Migrate dnsmasq config files #5479

merged 5 commits into from May 12, 2024

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Nov 6, 2023

What does this implement/fix?

Migrate dnsmasq config files originally created by a Pi-hole version pre-v6.0 from /etc/dnsmasq.d into a new directory owned by user/group pihole. This ensures they stay available for later debugging, and won't cause when, e.g., the user later decides to install a dnsmasq from the repository.

The differences to how it is done before are:

  1. The files are moved completely out of the way of any possibly external dnsmasq and won't cause conflicts,
  2. The files can be moved by the installer even if "something" happens in between and the files are now owned by, e.g., root (pihole-FTL could then not move/rename them itself).

This PR is meant to be used in combination with pi-hole/FTL#1737


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.

@DL6ER DL6ER requested a review from a team November 6, 2023 13:59
DL6ER added a commit to pi-hole/FTL that referenced this pull request Nov 6, 2023
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.

Get some rest!

automated install/basic-install.sh Outdated Show resolved Hide resolved
automated install/basic-install.sh Outdated Show resolved Hide resolved
Co-authored-by: Adam Warner <[email protected]>
Co-authored-by: RD WebDesign <[email protected]>
Signed-off-by: DL6ER <[email protected]>
@DL6ER DL6ER requested a review from PromoFaux November 7, 2023 07:58
@DL6ER
Copy link
Member Author

DL6ER commented Nov 7, 2023

Sorry, I don't really know what happened here. The file somehow got mangled after I tested it... Thanks for your thorough check!

@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/issue-with-dhcp/66195/2

@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/issue-with-dhcp/66195/4

@DL6ER DL6ER requested a review from a team December 9, 2023 22:02
@PromoFaux
Copy link
Member

Does this branch need rebasing? Just built a local container based on it and:

++ pihole-FTL sqlite3 -ni /etc/pihole/gravity.db 'SELECT "value" FROM "info" WHERE "property" = '\''version'\'';'
pihole  | sqlite3: Error: unknown option: -ni
pihole  | Use -help for a list of options.
pihole  | + version=

@DL6ER
Copy link
Member Author

DL6ER commented Feb 19, 2024

Indeed, a merge did just happen

@DL6ER
Copy link
Member Author

DL6ER commented May 12, 2024

This PR still needs merging to ensure we remove files from /etc/dnsmasq.d Pi-hole has put there before

@DL6ER DL6ER merged commit dd2c1c6 into development-v6 May 12, 2024
15 checks passed
@DL6ER DL6ER deleted the new/migrate_dnsmasq_conf branch May 12, 2024 16:53
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

4 participants