Move 'clear dns' and 'clear connection-tracking' to 'reset dns' and

'reset connection-tracking'
(cherry picked from commit c26d0f90bd39af8f58ab9f6ac75786c3dda87a55)

12 files changed, 4 insertions, 13 deletions

diff --git a/templates/clear/arp/address/node.def b/templates/clear/arp/address/node.def
deleted file mode 100644
index efe6f10..0000000
--- a/templates/clear/arp/address/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear ARP cache for an IPv4 address
diff --git a/templates/clear/arp/address/node.tag/node.def b/templates/clear/arp/address/node.tag/node.def
deleted file mode 100644
index 2c523ef..0000000
--- a/templates/clear/arp/address/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Clear ARP cache for an IPv4 address
-allowed: echo -n '<x.x.x.x>'
-run: sudo /sbin/ip neigh flush to "$4"
diff --git a/templates/clear/arp/interface/node.def b/templates/clear/arp/interface/node.def
deleted file mode 100644
index 9dbcaff..0000000
--- a/templates/clear/arp/interface/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear ARP cache for interface
diff --git a/templates/clear/arp/interface/node.tag/node.def b/templates/clear/arp/interface/node.tag/node.def
deleted file mode 100644
index 1a12602..0000000
--- a/templates/clear/arp/interface/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Clear ARP cache for interface
-allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all
-run: sudo /sbin/ip neigh flush dev "$4"
diff --git a/templates/clear/arp/node.def b/templates/clear/arp/node.def
deleted file mode 100644
index 394a9f0..0000000
--- a/templates/clear/arp/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear Address Resolution Protocol (ARP) cache
diff --git a/templates/clear/dns/forwarding/node.def b/templates/clear/dns/forwarding/node.def
deleted file mode 100644
index 3cc321c..0000000
--- a/templates/clear/dns/forwarding/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear DNS forwarding variables
diff --git a/templates/clear/dns/node.def b/templates/clear/dns/node.def
deleted file mode 100644
index bca966e..0000000
--- a/templates/clear/dns/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear Domain Name Server (DNS) variables
diff --git a/templates/clear/connection-tracking/node.def b/templates/reset/connection-tracking/node.def
index 8e588da..8e588da 100644
--- a/templates/clear/connection-tracking/node.def
+++ b/templates/reset/connection-tracking/node.def
diff --git a/templates/clear/dns/forwarding/all/node.def b/templates/reset/dns/forwarding/all/node.def
index b439b78..b90aafb 100644
--- a/templates/clear/dns/forwarding/all/node.def
+++ b/templates/reset/dns/forwarding/all/node.def
@@ -1,4 +1,4 @@
-help: Clear DNS forwarding cache and counters
+help: Reset DNS forwarding cache and counters
 run:
         if ps ax | grep dnsmasq | grep -v grep > /dev/null
         then
diff --git a/templates/clear/dns/forwarding/cache/node.def b/templates/reset/dns/forwarding/cache/node.def
index 8a5f8cc..9e1a610 100644
--- a/templates/clear/dns/forwarding/cache/node.def
+++ b/templates/reset/dns/forwarding/cache/node.def
@@ -1,4 +1,4 @@
-help: Clear DNS forwarding cache
+help: Reset DNS forwarding cache
 run:
         if ps ax | grep dnsmasq | grep -v grep > /dev/null
         then
diff --git a/templates/reset/dns/forwarding/node.def b/templates/reset/dns/forwarding/node.def
new file mode 100644
index 0000000..a1bcb10
--- /dev/null
+++ b/templates/reset/dns/forwarding/node.def
@@ -0,0 +1 @@
+help: Reset DNS forwarding variables
diff --git a/templates/reset/dns/node.def b/templates/reset/dns/node.def
new file mode 100644
index 0000000..5f8ef26
--- /dev/null
+++ b/templates/reset/dns/node.def
@@ -0,0 +1 @@
+help: Reset Domain Name Server (DNS) variables