Export DNS_FQDN_REQUIRED and DNS_BOGUS_PRIV to setupVars.conf during installation #4327
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
git rebase
)Please make sure you Sign Off all commits. Pi-hole enforces the DCO.
What does this PR aim to accomplish?:
On a fresh installation there is a mismatch between the options "Never formward non-FQDN" and "Never forward reverse lookups for private IP ranges" which are apparently enabled on the web interface but the resp. options (domain-needed and bogus-priv) are missing in the
01-pihole.conf
dnsmasq config file.Although the options are set in the template of
01-pihole.conf
located in the local repo clone, they are going to be removed at the end of the installation script because it callspi-hole/advanced/Scripts/webpage.sh
Line 147 in 2673c2c
from webpage.sh. The options would have been re-added by the script but only if
DNS_FQDN_REQUIRED
andDNS_BOGUS_PRIV
are true. But they are not, because they have not been exported tosetupVars.conf
in the install scriptspi-hole/automated install/basic-install.sh
Lines 1806 to 1817 in 2673c2c
For more information see here: pi-hole/web#1873 (comment)
I see two solutions to this:
setupVars.conf
01-pihole.conf
templateHow does this PR accomplish the above?:
Implements solution 1.
Exports DNS_FQDN_REQUIRED and DNS_BOGUS_PRIV to setupVars.conf during installation
What documentation changes (if any) are needed to support this PR?:
A detailed list of any necessary changes