From 9d0c8946c537a1d857df67be2ffc26255c24bdbb Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Tue, 9 Feb 2016 02:08:23 -0500 Subject: Use directory /var/lib/dhcp instead of /var/lib/dhcp3. Use directory /etc/dhcp instead of /etc/dhcp3. --- templates/service/dns/forwarding/dhcp/node.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/service/dns/forwarding') diff --git a/templates/service/dns/forwarding/dhcp/node.def b/templates/service/dns/forwarding/dhcp/node.def index 700f703e..f19b000e 100644 --- a/templates/service/dns/forwarding/dhcp/node.def +++ b/templates/service/dns/forwarding/dhcp/node.def @@ -4,5 +4,5 @@ help: Use nameservers received from DHCP server for specified interface commit:expression: exec "/opt/vyatta/sbin/vyatta-dns-forwarding.pl --dhcp-interface $VAR(@)" allowed: local -a array ; - array=( /var/lib/dhcp3/eth* /var/lib/dhcp3/br* ) ; + array=( /var/lib/dhcp/eth* /var/lib/dhcp/br* ) ; echo -n ${array[@]##*/} -- cgit v1.2.3 From 4a03838ea877a3a867b283ba85956795e769d563 Mon Sep 17 00:00:00 2001 From: brennen Date: Mon, 21 Nov 2016 10:59:44 -0800 Subject: Add flag for DNSmasq to query all dns servers. This feature, when used properly, can massively increase DNS performance. See: http://ma.ttwagner.com/make-dns-fly-with-dnsmasq-all-servers/ --- scripts/dns-forwarding/vyatta-dns-forwarding.pl | 4 ++++ templates/service/dns/forwarding/query-all-servers/node.def | 1 + 2 files changed, 5 insertions(+) create mode 100644 templates/service/dns/forwarding/query-all-servers/node.def (limited to 'templates/service/dns/forwarding') diff --git a/scripts/dns-forwarding/vyatta-dns-forwarding.pl b/scripts/dns-forwarding/vyatta-dns-forwarding.pl index 46e038b5..807afa28 100755 --- a/scripts/dns-forwarding/vyatta-dns-forwarding.pl +++ b/scripts/dns-forwarding/vyatta-dns-forwarding.pl @@ -95,6 +95,10 @@ sub dnsforwarding_get_values { $output .= "cache-size=$cache_size\n"; } + if (defined $query_all_servers) { + $output .= "all-servers\n"; + } + if (defined $ignore_hosts_file) { $output .= "no-hosts\n"; } diff --git a/templates/service/dns/forwarding/query-all-servers/node.def b/templates/service/dns/forwarding/query-all-servers/node.def new file mode 100644 index 00000000..90e8e7ec --- /dev/null +++ b/templates/service/dns/forwarding/query-all-servers/node.def @@ -0,0 +1 @@ +help: Query all DNS servers, respond and cache fastest result -- cgit v1.2.3 From 9703bda9c3e6d7172851ba4420679364fb3e62f0 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 28 Dec 2017 00:39:54 +0100 Subject: T297: Fix DNS Forwarding server does not allow IPv6 address in name-server --- debian/changelog | 6 ++++++ templates/service/dns/forwarding/name-server/node.def | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'templates/service/dns/forwarding') diff --git a/debian/changelog b/debian/changelog index d1169cde..0675e402 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-system (0.20.44+vyos2+current7) unstable; urgency=medium + + * T297: Fix DNS Forwarding server does not allow IPv6 address in name-server + + -- Christian Poessinger Thu, 28 Dec 2017 00:39:04 +0100 + vyatta-cfg-system (0.20.44+vyos2+current6) unstable; urgency=medium * T496: remove diagnostic partition for RAID1 installs 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 -- cgit v1.2.3 From d0af07c4b5f56b8faf2340c97676c2ff1b6a0933 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 21 Feb 2018 11:28:30 +0100 Subject: T546: Add support for IPv6 address in 'service dns forwarding domain' --- templates/service/dns/forwarding/domain/node.tag/server/node.def | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'templates/service/dns/forwarding') diff --git a/templates/service/dns/forwarding/domain/node.tag/server/node.def b/templates/service/dns/forwarding/domain/node.tag/server/node.def index 8f40a299..e616c0aa 100644 --- a/templates/service/dns/forwarding/domain/node.tag/server/node.def +++ b/templates/service/dns/forwarding/domain/node.tag/server/node.def @@ -1,3 +1,5 @@ multi: -type: ipv4 -help: DNS server to forward queries +type: ipv4,ipv6 +help: Domain Name Server (DNS) to forward queries +val_help: ipv4; Domain Name Server (DNS) address +val_help: ipv6; Domain Name Server (DNS) address -- cgit v1.2.3 From df78ae1e4411c15f27f5f29b172b71504c444637 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 16 Mar 2018 20:09:27 +0100 Subject: Remove dns forwarding templates in favor of vyos-1x --- templates/service/dns/forwarding/cache-size/node.def | 5 ----- templates/service/dns/forwarding/dhcp/node.def | 8 -------- templates/service/dns/forwarding/domain/node.def | 4 ---- .../service/dns/forwarding/domain/node.tag/server/node.def | 5 ----- templates/service/dns/forwarding/ignore-hosts-file/node.def | 1 - templates/service/dns/forwarding/listen-on/node.def | 5 ----- templates/service/dns/forwarding/name-server/node.def | 5 ----- templates/service/dns/forwarding/node.def | 10 ---------- templates/service/dns/forwarding/query-all-servers/node.def | 1 - templates/service/dns/forwarding/system/node.def | 2 -- 10 files changed, 46 deletions(-) delete mode 100644 templates/service/dns/forwarding/cache-size/node.def delete mode 100644 templates/service/dns/forwarding/dhcp/node.def delete mode 100644 templates/service/dns/forwarding/domain/node.def delete mode 100644 templates/service/dns/forwarding/domain/node.tag/server/node.def delete mode 100644 templates/service/dns/forwarding/ignore-hosts-file/node.def delete mode 100644 templates/service/dns/forwarding/listen-on/node.def delete mode 100644 templates/service/dns/forwarding/name-server/node.def delete mode 100644 templates/service/dns/forwarding/node.def delete mode 100644 templates/service/dns/forwarding/query-all-servers/node.def delete mode 100644 templates/service/dns/forwarding/system/node.def (limited to 'templates/service/dns/forwarding') diff --git a/templates/service/dns/forwarding/cache-size/node.def b/templates/service/dns/forwarding/cache-size/node.def deleted file mode 100644 index 9285dbbd..00000000 --- a/templates/service/dns/forwarding/cache-size/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: u32 -default:150 -help: DNS forwarding cache size -syntax:expression: ($VAR(@) >=0 && $VAR(@) < 10001) ; "Cache size must be between 0 and 10000" -val_help: u32:0-10000; DNS forwarding cache size diff --git a/templates/service/dns/forwarding/dhcp/node.def b/templates/service/dns/forwarding/dhcp/node.def deleted file mode 100644 index f19b000e..00000000 --- a/templates/service/dns/forwarding/dhcp/node.def +++ /dev/null @@ -1,8 +0,0 @@ -multi: -type: txt -help: Use nameservers received from DHCP server for specified interface -commit:expression: exec "/opt/vyatta/sbin/vyatta-dns-forwarding.pl --dhcp-interface $VAR(@)" -allowed: - local -a array ; - array=( /var/lib/dhcp/eth* /var/lib/dhcp/br* ) ; - echo -n ${array[@]##*/} diff --git a/templates/service/dns/forwarding/domain/node.def b/templates/service/dns/forwarding/domain/node.def deleted file mode 100644 index bdd82752..00000000 --- a/templates/service/dns/forwarding/domain/node.def +++ /dev/null @@ -1,4 +0,0 @@ -tag: -type: txt -help: DNS domain to forward to a local server -commit:expression: $VAR(./server/) != ""; "Error: No server configured for the domain $VAR(@)" diff --git a/templates/service/dns/forwarding/domain/node.tag/server/node.def b/templates/service/dns/forwarding/domain/node.tag/server/node.def deleted file mode 100644 index e616c0aa..00000000 --- a/templates/service/dns/forwarding/domain/node.tag/server/node.def +++ /dev/null @@ -1,5 +0,0 @@ -multi: -type: ipv4,ipv6 -help: Domain Name Server (DNS) to forward queries -val_help: ipv4; Domain Name Server (DNS) address -val_help: ipv6; Domain Name Server (DNS) address diff --git a/templates/service/dns/forwarding/ignore-hosts-file/node.def b/templates/service/dns/forwarding/ignore-hosts-file/node.def deleted file mode 100644 index 08a89ca8..00000000 --- a/templates/service/dns/forwarding/ignore-hosts-file/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Do not use local /etc/hosts file in name resolution diff --git a/templates/service/dns/forwarding/listen-on/node.def b/templates/service/dns/forwarding/listen-on/node.def deleted file mode 100644 index 3d1c748f..00000000 --- a/templates/service/dns/forwarding/listen-on/node.def +++ /dev/null @@ -1,5 +0,0 @@ -multi: -type: txt -help: Interface to listen for DNS queries [REQUIRED] -allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=all -commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --warn" diff --git a/templates/service/dns/forwarding/name-server/node.def b/templates/service/dns/forwarding/name-server/node.def deleted file mode 100644 index ac7e45b6..00000000 --- a/templates/service/dns/forwarding/name-server/node.def +++ /dev/null @@ -1,5 +0,0 @@ -multi: -type: ipv4,ipv6 -help: Domain Name Server (DNS) -val_help: ipv4; Domain Name Server (DNS) address -val_help: ipv6; Domain Name Server (DNS) address diff --git a/templates/service/dns/forwarding/node.def b/templates/service/dns/forwarding/node.def deleted file mode 100644 index ae7a9d3c..00000000 --- a/templates/service/dns/forwarding/node.def +++ /dev/null @@ -1,10 +0,0 @@ -priority: 918 -help: DNS forwarding -commit:expression: $VAR(./listen-on) != ""; "At least one interface must be configured for DNS forwarding parameter 'listen-on'" -delete:expression: "touch /tmp/dnsmasq.$PPID" -end:expression: "if [ -f \"/tmp/dnsmasq.$PPID\" ]; then \ - sudo /opt/vyatta/sbin/vyatta-dns-forwarding.pl --stop-dnsforwarding \ - rm /tmp/dnsmasq.$PPID; \ - else \ - sudo /opt/vyatta/sbin/vyatta-dns-forwarding.pl --update-dnsforwarding; \ - fi; " diff --git a/templates/service/dns/forwarding/query-all-servers/node.def b/templates/service/dns/forwarding/query-all-servers/node.def deleted file mode 100644 index 90e8e7ec..00000000 --- a/templates/service/dns/forwarding/query-all-servers/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Query all DNS servers, respond and cache fastest result diff --git a/templates/service/dns/forwarding/system/node.def b/templates/service/dns/forwarding/system/node.def deleted file mode 100644 index a37676de..00000000 --- a/templates/service/dns/forwarding/system/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: DNS forwarding to system nameservers -commit:expression: exec "/opt/vyatta/sbin/vyatta-dns-forwarding.pl --system-nameserver" -- cgit v1.2.3