From 44029ab72eb3db14347b75a1dbd4f5adf4eb08f7 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Wed, 13 Oct 2010 18:11:56 -0700
Subject: Revise new ntp server config

Putting it in 'system { ntp { server...' makes more sense.
---
 templates/service/ntp/node.def                         | 18 ------------------
 templates/service/ntp/server/node.def                  |  3 ---
 templates/service/ntp/server/node.tag/dynamic/node.def |  2 --
 .../service/ntp/server/node.tag/noselect/node.def      |  1 -
 templates/service/ntp/server/node.tag/preempt/node.def |  1 -
 templates/service/ntp/server/node.tag/prefer/node.def  |  1 -
 6 files changed, 26 deletions(-)
 delete mode 100644 templates/service/ntp/node.def
 delete mode 100644 templates/service/ntp/server/node.def
 delete mode 100644 templates/service/ntp/server/node.tag/dynamic/node.def
 delete mode 100644 templates/service/ntp/server/node.tag/noselect/node.def
 delete mode 100644 templates/service/ntp/server/node.tag/preempt/node.def
 delete mode 100644 templates/service/ntp/server/node.tag/prefer/node.def

(limited to 'templates/service')

diff --git a/templates/service/ntp/node.def b/templates/service/ntp/node.def
deleted file mode 100644
index c5d99724..00000000
--- a/templates/service/ntp/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-priority: 400
-help: Network Time Protocol (NTP) configuration
-
-end: 
-     /opt/vyatta/sbin/vyatta_update_ntp.pl </etc/ntp.conf >/tmp/ntp.conf
-     sudo cp -b /tmp/ntp.conf /etc/ntp.conf
-     if grep -q '^server' /etc/ntp.conf
-     then 
-	 if /usr/sbin/invoke-rc.d ntp status >/dev/null
-	 then
-	     sudo /usr/sbin/invoke-rc.d ntp force-reload
-         else
-	     sudo /usr/sbin/invoke-rc.d ntp start
-	 fi
-     else
-	 sudo /usr/sbin/invoke-rc.d ntp stop
-     fi
-     rm -f /tmp/ntp.conf
diff --git a/templates/service/ntp/server/node.def b/templates/service/ntp/server/node.def
deleted file mode 100644
index 383bd992..00000000
--- a/templates/service/ntp/server/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-tag:
-type: txt
-help: Network Time Protocol (NTP) server
diff --git a/templates/service/ntp/server/node.tag/dynamic/node.def b/templates/service/ntp/server/node.tag/dynamic/node.def
deleted file mode 100644
index 0a7df0c0..00000000
--- a/templates/service/ntp/server/node.tag/dynamic/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Allow server to be configured eve if not reachable
-
diff --git a/templates/service/ntp/server/node.tag/noselect/node.def b/templates/service/ntp/server/node.tag/noselect/node.def
deleted file mode 100644
index e2e061b5..00000000
--- a/templates/service/ntp/server/node.tag/noselect/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Marks the server as unused
diff --git a/templates/service/ntp/server/node.tag/preempt/node.def b/templates/service/ntp/server/node.tag/preempt/node.def
deleted file mode 100644
index ca89efa1..00000000
--- a/templates/service/ntp/server/node.tag/preempt/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Specifies the association as preemptable rather than the default persistent
diff --git a/templates/service/ntp/server/node.tag/prefer/node.def b/templates/service/ntp/server/node.tag/prefer/node.def
deleted file mode 100644
index 4855fd41..00000000
--- a/templates/service/ntp/server/node.tag/prefer/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Marks the server as preferred
-- 
cgit v1.2.3