diff options
| author | Indrajit Raychaudhuri <irc@indrajit.com> | 2023-03-27 03:56:13 -0500 |
|---|---|---|
| committer | Indrajit Raychaudhuri <irc@indrajit.com> | 2023-03-28 10:16:07 -0500 |
| commit | 2bb5c5d0fd9ed07649b81a61e9c1a78a9f222405 (patch) | |
| tree | 1dd4acf56be2818873b4a3c2c1cdc145f81063bd /interface-definitions | |
| parent | b5d940d9f279a8391c8d8c56cc86f4855c9d38b5 (diff) | |
| download | vyos-1x-2bb5c5d0fd9ed07649b81a61e9c1a78a9f222405.tar.gz vyos-1x-2bb5c5d0fd9ed07649b81a61e9c1a78a9f222405.zip | |
dns: T5115: Support custom port for name servers for forwarding zones.
This would allow using custom ports in name server operating on non-
default port for forwarding zones.
This is a follow-up to T5113 for sake of completeness and having
consistent treatment of all name servers configured in PowerDNS recursor.
Additionally, migrate `service dns forwarding domain example.com server`
to `service dns forwarding domain foo3.com name-server` for consistency
and reusability.
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/dns-forwarding.xml.in | 19 | ||||
| -rw-r--r-- | interface-definitions/include/name-server-ipv4-ipv6-port.xml.i | 2 |
2 files changed, 2 insertions, 19 deletions
diff --git a/interface-definitions/dns-forwarding.xml.in b/interface-definitions/dns-forwarding.xml.in index b23eaa351..14b38b24d 100644 --- a/interface-definitions/dns-forwarding.xml.in +++ b/interface-definitions/dns-forwarding.xml.in @@ -85,24 +85,7 @@ <help>Domain to forward to a custom DNS server</help> </properties> <children> - <leafNode name="server"> - <properties> - <help>Domain Name Server (DNS) to forward queries to</help> - <valueHelp> - <format>ipv4</format> - <description>Domain Name Server (DNS) IPv4 address</description> - </valueHelp> - <valueHelp> - <format>ipv6</format> - <description>Domain Name Server (DNS) IPv6 address</description> - </valueHelp> - <multi/> - <constraint> - <validator name="ipv4-address"/> - <validator name="ipv6-address"/> - </constraint> - </properties> - </leafNode> + #include <include/name-server-ipv4-ipv6-port.xml.i> <leafNode name="addnta"> <properties> <help>Add NTA (negative trust anchor) for this domain (must be set if the domain does not support DNSSEC)</help> diff --git a/interface-definitions/include/name-server-ipv4-ipv6-port.xml.i b/interface-definitions/include/name-server-ipv4-ipv6-port.xml.i index cf86e66a2..fb0a4f4ae 100644 --- a/interface-definitions/include/name-server-ipv4-ipv6-port.xml.i +++ b/interface-definitions/include/name-server-ipv4-ipv6-port.xml.i @@ -1,7 +1,7 @@ <!-- include start from name-server-ipv4-ipv6-port.xml.i --> <tagNode name="name-server"> <properties> - <help>Domain Name Servers (DNS) addresses</help> + <help>Domain Name Servers (DNS) addresses to forward queries to</help> <valueHelp> <format>ipv4</format> <description>Domain Name Server (DNS) IPv4 address</description> |