diff options
| author | Daniil Baturin <daniil@vyos.io> | 2020-06-22 13:24:30 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-22 13:24:30 +0700 |
| commit | 1d09b1a788cc91ff64134d853f063dc0a364ad50 (patch) | |
| tree | 1dca2298b55d26ba24347a14dfc5a837d92aefff /interface-definitions | |
| parent | a8041aa4a9e70c267c17451c14c7dcf9ca887023 (diff) | |
| parent | 0ccdf15c0acb0be128fa2346b72cfdd8ce16b694 (diff) | |
| download | vyos-1x-1d09b1a788cc91ff64134d853f063dc0a364ad50.tar.gz vyos-1x-1d09b1a788cc91ff64134d853f063dc0a364ad50.zip | |
Merge pull request #452 from jjakob/T2486-dns-hostsd-fixes
T2486: DNS, vyos-hostsd fixes
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/dns-domain-name.xml.in | 20 | ||||
| -rw-r--r-- | interface-definitions/dns-forwarding.xml.in | 14 |
2 files changed, 24 insertions, 10 deletions
diff --git a/interface-definitions/dns-domain-name.xml.in b/interface-definitions/dns-domain-name.xml.in index eeaa5b2c1..3b5843b53 100644 --- a/interface-definitions/dns-domain-name.xml.in +++ b/interface-definitions/dns-domain-name.xml.in @@ -5,7 +5,7 @@ <children> <leafNode name="name-server" owner="${vyos_conf_scripts_dir}/host_name.py"> <properties> - <help>Domain Name Server (DNS)</help> + <help>Domain Name Servers (DNS) used by the system (resolv.conf)</help> <priority>400</priority> <valueHelp> <format>ipv4</format> @@ -22,6 +22,16 @@ </constraint> </properties> </leafNode> + <leafNode name="name-servers-dhcp" owner="${vyos_conf_scripts_dir}/host_name.py"> + <properties> + <help>Interfaces whose DHCP client nameservers will be used by the system (resolv.conf)</help> + <priority>400</priority> + <completionHelp> + <script>${vyos_completion_dir}/list_interfaces.py</script> + </completionHelp> + <multi/> + </properties> + </leafNode> <leafNode name="host-name" owner="${vyos_conf_scripts_dir}/host_name.py"> <properties> <help>System host name (default: vyos)</help> @@ -56,20 +66,12 @@ </leafNode> </children> </node> - <leafNode name="disable-dhcp-nameservers" owner="${vyos_conf_scripts_dir}/host_name.py"> - <properties> - <help>Disable DHCP updates of DNS settings</help> - <priority>300</priority> - <valueless/> - </properties> - </leafNode> <node name="static-host-mapping" owner="${vyos_conf_scripts_dir}/host_name.py"> <properties> <help>Map host names to addresses</help> <priority>400</priority> </properties> <children> - <tagNode name="host-name"> <properties> <help>Host name for static address mapping</help> diff --git a/interface-definitions/dns-forwarding.xml.in b/interface-definitions/dns-forwarding.xml.in index 8b89bf758..993d69fe1 100644 --- a/interface-definitions/dns-forwarding.xml.in +++ b/interface-definitions/dns-forwarding.xml.in @@ -28,7 +28,7 @@ </leafNode> <leafNode name="dhcp"> <properties> - <help>Use DNS servers received from DHCP server for specified interface</help> + <help>Interfaces whose DHCP client nameservers to forward requests to</help> <completionHelp> <script>${vyos_completion_dir}/list_interfaces.py</script> </completionHelp> @@ -89,6 +89,18 @@ </constraint> </properties> </leafNode> + <leafNode name="addnta"> + <properties> + <help>Add NTA (negative trust anchor) for this domain (must be set if the domain doesn't support DNSSEC)</help> + <valueless/> + </properties> + </leafNode> + <leafNode name="recursion-desired"> + <properties> + <help>Set the "recursion desired" bit in requests to the upstream nameserver</help> + <valueless/> + </properties> + </leafNode> </children> </tagNode> <leafNode name="ignore-hosts-file"> |