summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2017-12-28 00:40:15 +0100
committerChristian Poessinger <christian@poessinger.com>2017-12-28 00:40:15 +0100
commitc5e11462769bea9769335944f0f8a8f5411d027e (patch)
tree37f545f700285df9e9328477e756ef5d9bdea251 /templates
parent04982592bfeeb70929afb73c93eb117a5ebca875 (diff)
parent9703bda9c3e6d7172851ba4420679364fb3e62f0 (diff)
downloadvyatta-cfg-system-c5e11462769bea9769335944f0f8a8f5411d027e.tar.gz
vyatta-cfg-system-c5e11462769bea9769335944f0f8a8f5411d027e.zip
Merge branch 't297-dnsmasq-ipv6' into current
* t297-dnsmasq-ipv6: T297: Fix DNS Forwarding server does not allow IPv6 address in name-server
Diffstat (limited to 'templates')
-rw-r--r--templates/service/dns/forwarding/name-server/node.def6
1 files changed, 4 insertions, 2 deletions
diff --git a/templates/service/dns/forwarding/name-server/node.def b/templates/service/dns/forwarding/name-server/node.def
index 3ed4c459..ac7e45b6 100644
--- a/templates/service/dns/forwarding/name-server/node.def
+++ b/templates/service/dns/forwarding/name-server/node.def
@@ -1,3 +1,5 @@
multi:
-type: ipv4
-help: DNS server to forward queries
+type: ipv4,ipv6
+help: Domain Name Server (DNS)
+val_help: ipv4; Domain Name Server (DNS) address
+val_help: ipv6; Domain Name Server (DNS) address