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

Add example for custom DNS server with port number #4718

Merged
merged 3 commits into from
May 9, 2022

Conversation

sed-i
Copy link
Contributor

@sed-i sed-i commented Apr 25, 2022

By submitting this pull request, I confirm the following:
please fill any appropriate checkboxes, e.g: [X]

  • 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, and have included unit tests where possible.
  • 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)

Please make sure you Sign Off all commits. Pi-hole enforces the DCO.


What does this PR aim to accomplish?:
A detailed description, screenshots (if necessary), as well as links to any relevant GitHub issues
Provide an example for how to specify a custom DNS address including a port number.

How does this PR accomplish the above?:
A detailed description (such as a changelog) and screenshots (if necessary) of the implemented fix
Update a string.

What documentation changes (if any) are needed to support this PR?:
A detailed list of any necessary changes
None.


  • You must follow the template instructions. Failure to do so will result in your pull request being closed.
  • Please respect that Pi-hole is developed by volunteers, who can only reply in their spare time.

Signed-off-by: sed-i <82407168+sed-i@users.noreply.github.com>
@dschaper
Copy link
Member

Hi, can you make sure your commits and PR target are the correct branch. The contributors guide has the information.

@sed-i sed-i changed the base branch from master to development April 25, 2022 23:46
@sed-i
Copy link
Contributor Author

sed-i commented Apr 25, 2022

Hi, can you make sure your commits and PR target are the correct branch. The contributors guide has the information.

Thanks @dschaper. Done.

@dschaper dschaper removed the PR: Master branch PR based on Master Branch label Apr 25, 2022
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.

I vaguely remember we once had an issue where IP#PORT combination during the installation were not accepted. I can't find the issue right now. It might have been resolved already by #4121.

@sed-i Did you try, if a port can be added to the upstream DNS server IP during the installation successfully?

automated install/basic-install.sh Outdated Show resolved Hide resolved
@sed-i
Copy link
Contributor Author

sed-i commented Apr 26, 2022

@sed-i Did you try, if a port can be added to the upstream DNS server IP during the installation successfully?

I think it works:
Screenshot_20220426_171626

$ sudo grep -Irn "127\.0\.0\.1#5335" /etc
/etc/pihole/setupVars.conf:4:PIHOLE_DNS_1=127.0.0.1#5335
/etc/pihole/setupVars.conf:5:PIHOLE_DNS_2=127.0.0.1#5335
/etc/dnsmasq.d/01-pihole.conf:38:server=127.0.0.1#5335

However, I do not know at the moment how to test this: pi-hole/docs#695

@yubiuser
Copy link
Member

Thanks for testing

@yubiuser yubiuser enabled auto-merge May 9, 2022 15:17
@yubiuser yubiuser merged commit 6d73454 into pi-hole:development May 9, 2022
@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

@sed-i sed-i deleted the patch-1 branch July 7, 2022 20:31
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.

None yet

4 participants