From 1d585211474c30fd62c0a48e96e21170e18c9682 Mon Sep 17 00:00:00 2001
From: Mohit Mehta <mohit.mehta@vyatta.com>
Date: Thu, 11 Sep 2008 11:15:30 -0700
Subject: use script for setting/deleting system nameservers

---
 templates/system/name-server/node.def | 35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

(limited to 'templates/system')

diff --git a/templates/system/name-server/node.def b/templates/system/name-server/node.def
index d2ce0c30..f762a8a1 100644
--- a/templates/system/name-server/node.def
+++ b/templates/system/name-server/node.def
@@ -1,36 +1,5 @@
 multi:
 type: ipv4
 help: Set Domain Name Server (DNS)
-update: touch /etc/resolv.conf
-if grep -q "$VAR(@)\($\|[[:space:]]\)" /etc/resolv.conf; then
-  exit 0
-else
-  cli_ns_array=($(awk '{if (!$3) print $2}' /etc/resolv.conf))
-  cli_ns_array_len=${#cli_ns_array[*]}
-  line_num=0
-  if [ $cli_ns_array_len -gt 0 ]; then
-     grepped_ns_line=`grep "${cli_ns_array[$cli_ns_array_len-1]}$" -n /etc/resolv.conf`
-     echo ${grepped_ns_line%%:*} > /etc/resolv_tmp.conf
-     line_num=`cat /etc/resolv_tmp.conf`
-  fi
-     head -$line_num /etc/resolv.conf > /etc/resolv_tmp.conf
-     echo "nameserver      $VAR(@)" >> /etc/resolv_tmp.conf
-     total_lines=`cat /etc/resolv.conf | wc -l`
-     rest_lines=`expr $total_lines - $line_num`
-     tail -$rest_lines /etc/resolv.conf >> /etc/resolv_tmp.conf
-     mv -f /etc/resolv_tmp.conf /etc/resolv.conf
-fi &&
-if [ -d /opt/vyatta/config/active/service/dns/forwarding ]; then
-   /opt/vyatta/sbin/vyatta-dns-forwarding.pl --update-dnsforwarding >&/dev/null
-fi &&
-if [ -f /etc/ntp.conf ] && grep -q 'server' /etc/ntp.conf; then
-  /usr/sbin/invoke-rc.d ntp restart >&/dev/null
-fi
-delete:expression: "sudo sh -c \"touch /etc/resolv.conf && \
-sed -i '/$VAR(@)$/d' /etc/resolv.conf && \
-if [ -f /etc/ntp.conf ] && grep -q 'server' /etc/ntp.conf; then \
-  /usr/sbin/invoke-rc.d ntp restart >&/dev/null; \
-fi && \
-if [ -d /opt/vyatta/config/active/service/dns/forwarding ]; then \
-      /opt/vyatta/sbin/vyatta-dns-forwarding.pl --update-dnsforwarding >&/dev/null; \
-fi\" "
+update: sudo /opt/vyatta/sbin/vyatta-system-nameservers update $VAR(@)
+delete: sudo /opt/vyatta/sbin/vyatta-system-nameservers delete $VAR(@)
-- 
cgit v1.2.3