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.

Sign up for GitHub

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

Jump to bottom

Unbound: fixed configuration when custom blocks are used #6756

Merged
merged 1 commit into from Aug 18, 2023
Merged

Unbound: fixed configuration when custom blocks are used #6756

merged 1 commit into from Aug 18, 2023

Conversation

Karlson2k
Copy link
Contributor

@Karlson2k Karlson2k commented Aug 18, 2023 •
edited

When any custom block is used, it may change the scope from server: which is expected by some configuration files.
Added explicit server: scope to configuration files that are missing it to avoid ambiguity,

Found this because custom block for forwarding to Dnscrypt-proxy changes the scope to forward-zone: and this produces error in access_lists.conf parsing.

fichtner
fichtner approved these changes Aug 18, 2023
View reviewed changes
Copy link
Member

@fichtner fichtner left a comment

Choose a reason for hiding this comment

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

makes sense, but handing over to @swhite2

@swhite2
Copy link
Member

swhite2 commented Aug 18, 2023

What about the private_domains.conf file? I see some clauses in there that are also normally grouped in server:. You could perhaps also test with include-toplevel: instead of include in unbound.inc. With a bit of luck the server clause is the default one anyway, which would prevent this issue for new configuration files.

@Karlson2k
Unbound: fixed configuration when custom blocks are used
fe6cf6d 
Signed-off-by: Evgeny Grin <k2k@narod.ru>
@Karlson2k
Copy link
Contributor Author

@swhite2 Correct, missed this one.

I've updated the PR.

@Karlson2k
Copy link
Contributor Author

I'd stay with simple bug-fix in this PR.
include-toplevel: is a good idea, but it is more like improvement and should go in another PR.

@swhite2
Copy link
Member

swhite2 commented Aug 18, 2023

Looks good, thanks!

@swhite2 swhite2 merged commit ccddb82 into opnsense:master Aug 18, 2023
fichtner pushed a commit that referenced this pull request Aug 21, 2023
@Karlson2k @fichtner
Unbound: fixed configuration when custom blocks are used (#6756)
5544ae0 
Signed-off-by: Evgeny Grin <k2k@narod.ru>
(cherry picked from commit ccddb82)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fichtner fichtner fichtner approved these changes

Assignees

@swhite2 swhite2

Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Karlson2k @swhite2 @fichtner