Improve DOMAIN* Handling #9
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Both DOMAIN and DOMAIN-SEARCH will now be searchable domains at all times, which will mirror the logic of scripts already built, for example update-resolv-conf and update-systemd-network. We will introduce a new DOMAIN-ROUTE option to better handle the logic specific to systemd-resolved.
DOMAIN should only ever allowed once. Any subsequent calls should be override the previous. Additionally, DOMAIN should always be first in the search list as it is the primary name defined.
jonathanio
added
Enhancement
WIP
Made DOMAIN a specific entry for systemd-resolve as the first searchable domain for an entry, and only a single value take (subsequent calls will override any previously set).
This check is supposed to test order, but it relies on the order of the numbers, not the order in the test file. Fix the appended numbers.
Incorrect test 04b meant that the dns_domain_count was incremented with every DOMAIN options supplied, when it should only be set to 1 (i.e. it has a value). Added additional test as well to test alongside DOMAIN-SEARCH.
Add in the required tests for DOMAIN-ROUTE so we can check handling.
run-tests assumed that busctl always ran if TEST_BUSCTL_CALLED was called. If it is expected, and busctl_called is not set, that should be a fail!
Add support for DOMAIN-ROUTE as an option to be passed to the script which will specify the listed domain to be routed using systemd-resolved via this VPN link using the DNS servers specified. This is not the same as DOMAIN or DOMAIN-SEARCH, as both of those options will allow systemd-resolved to append them to any bare name for searching (as in keeping with update-resolv-conf and update-systemd-network), and to some extent, Windows and macOS as well.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add support for
DOMAIN-ROUTEas an option to be passed to the script which will specify the listed domain to be routed usingsystemd-resolvedvia this VPN link using the DNS servers specified. This is not the same asDOMAINorDOMAIN-SEARCH, as both of those options will allowsystemd-resolvedto append them to any bare name for searching (as in keeping withupdate-resolv-confandupdate-systemd-network), and to some extent, Windows and macOS as well.