From d188aa86f11c2e7bde4015e4f4302a58aa3fe3c0 Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Wed, 17 Aug 2011 19:00:41 -0500
Subject: Move 'clear dns' and 'clear connection-tracking' to 'reset dns' and
 'reset connection-tracking' (cherry picked from commit
 c26d0f90bd39af8f58ab9f6ac75786c3dda87a55)

---
 templates/clear/arp/address/node.def            | 1 -
 templates/clear/arp/address/node.tag/node.def   | 3 ---
 templates/clear/arp/interface/node.def          | 1 -
 templates/clear/arp/interface/node.tag/node.def | 3 ---
 templates/clear/arp/node.def                    | 1 -
 templates/clear/connection-tracking/node.def    | 2 --
 templates/clear/dns/forwarding/all/node.def     | 8 --------
 templates/clear/dns/forwarding/cache/node.def   | 8 --------
 templates/clear/dns/forwarding/node.def         | 1 -
 templates/clear/dns/node.def                    | 1 -
 templates/reset/connection-tracking/node.def    | 2 ++
 templates/reset/dns/forwarding/all/node.def     | 8 ++++++++
 templates/reset/dns/forwarding/cache/node.def   | 8 ++++++++
 templates/reset/dns/forwarding/node.def         | 1 +
 templates/reset/dns/node.def                    | 1 +
 15 files changed, 20 insertions(+), 29 deletions(-)
 delete mode 100644 templates/clear/arp/address/node.def
 delete mode 100644 templates/clear/arp/address/node.tag/node.def
 delete mode 100644 templates/clear/arp/interface/node.def
 delete mode 100644 templates/clear/arp/interface/node.tag/node.def
 delete mode 100644 templates/clear/arp/node.def
 delete mode 100644 templates/clear/connection-tracking/node.def
 delete mode 100644 templates/clear/dns/forwarding/all/node.def
 delete mode 100644 templates/clear/dns/forwarding/cache/node.def
 delete mode 100644 templates/clear/dns/forwarding/node.def
 delete mode 100644 templates/clear/dns/node.def
 create mode 100644 templates/reset/connection-tracking/node.def
 create mode 100644 templates/reset/dns/forwarding/all/node.def
 create mode 100644 templates/reset/dns/forwarding/cache/node.def
 create mode 100644 templates/reset/dns/forwarding/node.def
 create mode 100644 templates/reset/dns/node.def

(limited to 'templates')

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/connection-tracking/node.def b/templates/clear/connection-tracking/node.def
deleted file mode 100644
index 8e588da..0000000
--- a/templates/clear/connection-tracking/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Clear all currently tracked connections
-run: sudo /opt/vyatta/bin/sudo-users/vyatta-clear-conntrack
diff --git a/templates/clear/dns/forwarding/all/node.def b/templates/clear/dns/forwarding/all/node.def
deleted file mode 100644
index b439b78..0000000
--- a/templates/clear/dns/forwarding/all/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-help: Clear DNS forwarding cache and counters
-run:
-        if ps ax | grep dnsmasq | grep -v grep > /dev/null
-        then
-            sudo /opt/vyatta/bin/sudo-users/vyatta-op-dns-forwarding.pl --clear-all
-        else
-            echo "DNS forwarding not configured"
-        fi
diff --git a/templates/clear/dns/forwarding/cache/node.def b/templates/clear/dns/forwarding/cache/node.def
deleted file mode 100644
index 8a5f8cc..0000000
--- a/templates/clear/dns/forwarding/cache/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-help: Clear DNS forwarding cache
-run:
-        if ps ax | grep dnsmasq | grep -v grep > /dev/null
-        then
-            sudo /opt/vyatta/bin/sudo-users/vyatta-op-dns-forwarding.pl --clear-cache
-        else
-            echo "DNS forwarding not configured"
-        fi
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/reset/connection-tracking/node.def b/templates/reset/connection-tracking/node.def
new file mode 100644
index 0000000..8e588da
--- /dev/null
+++ b/templates/reset/connection-tracking/node.def
@@ -0,0 +1,2 @@
+help: Clear all currently tracked connections
+run: sudo /opt/vyatta/bin/sudo-users/vyatta-clear-conntrack
diff --git a/templates/reset/dns/forwarding/all/node.def b/templates/reset/dns/forwarding/all/node.def
new file mode 100644
index 0000000..b90aafb
--- /dev/null
+++ b/templates/reset/dns/forwarding/all/node.def
@@ -0,0 +1,8 @@
+help: Reset DNS forwarding cache and counters
+run:
+        if ps ax | grep dnsmasq | grep -v grep > /dev/null
+        then
+            sudo /opt/vyatta/bin/sudo-users/vyatta-op-dns-forwarding.pl --clear-all
+        else
+            echo "DNS forwarding not configured"
+        fi
diff --git a/templates/reset/dns/forwarding/cache/node.def b/templates/reset/dns/forwarding/cache/node.def
new file mode 100644
index 0000000..9e1a610
--- /dev/null
+++ b/templates/reset/dns/forwarding/cache/node.def
@@ -0,0 +1,8 @@
+help: Reset DNS forwarding cache
+run:
+        if ps ax | grep dnsmasq | grep -v grep > /dev/null
+        then
+            sudo /opt/vyatta/bin/sudo-users/vyatta-op-dns-forwarding.pl --clear-cache
+        else
+            echo "DNS forwarding not configured"
+        fi
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
-- 
cgit v1.2.3