Merge branch 'master' into glendale

14 files changed, 28 insertions, 2 deletions

diff --git a/templates/show/arp/node.def b/templates/show/arp/node.def
new file mode 100644
index 0000000..021f848
--- /dev/null
+++ b/templates/show/arp/node.def
@@ -0,0 +1,2 @@
+help: Show Address Resolution Protocol Information
+run: /usr/sbin/arp -e
diff --git a/templates/show/bridge/node.def b/templates/show/bridge/node.def
new file mode 100644
index 0000000..45761f1
--- /dev/null
+++ b/templates/show/bridge/node.def
@@ -0,0 +1,2 @@
+help: "Show bridging information"
+run: sudo brctl show
diff --git a/templates/show/bridge/node.tag/macs/node.def b/templates/show/bridge/node.tag/macs/node.def
new file mode 100644
index 0000000..4f44832
--- /dev/null
+++ b/templates/show/bridge/node.tag/macs/node.def
@@ -0,0 +1,2 @@
+help: Show bridge MAC table"
+run: sudo brctl showmacs $3
diff --git a/templates/show/bridge/node.tag/node.def b/templates/show/bridge/node.tag/node.def
new file mode 100644
index 0000000..d439a03
--- /dev/null
+++ b/templates/show/bridge/node.tag/node.def
@@ -0,0 +1,5 @@
+help: Show bridge information for a given bridge
+allowed: local -a array ;
+	 array=( /sys/class/net/br* ) ;
+	 echo  -n ${array[@]##*/}
+run: sudo brctl show $3
diff --git a/templates/show/bridge/node.tag/spanning-tree/node.def b/templates/show/bridge/node.tag/spanning-tree/node.def
new file mode 100644
index 0000000..2da87a0
--- /dev/null
+++ b/templates/show/bridge/node.tag/spanning-tree/node.def
@@ -0,0 +1,2 @@
+help: Show bridge spanning tree information"
+run: sudo brctl showstp $3
diff --git a/templates/show/host/date/node.def b/templates/show/host/date/node.def
new file mode 100644
index 0000000..6ea4383
--- /dev/null
+++ b/templates/show/host/date/node.def
@@ -0,0 +1,2 @@
+help: Show host current date
+run: /bin/date
diff --git a/templates/show/host/lookup/node.def b/templates/show/host/lookup/node.def
new file mode 100644
index 0000000..d8368b6
--- /dev/null
+++ b/templates/show/host/lookup/node.def
@@ -0,0 +1 @@
+help: Lookup host info for host/ipaddress
diff --git a/templates/show/host/lookup/node.tag/node.def b/templates/show/host/lookup/node.tag/node.def
new file mode 100644
index 0000000..e0dd0df
--- /dev/null
+++ b/templates/show/host/lookup/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Lookup host information for host/ipaddres
+allowed: vyatta-allowed-hosts
+run: /usr/bin/host $4
diff --git a/templates/show/host/name/node.def b/templates/show/host/name/node.def
new file mode 100644
index 0000000..0197d10
--- /dev/null
+++ b/templates/show/host/name/node.def
@@ -0,0 +1,2 @@
+help: Show host name
+run: /bin/hostname
diff --git a/templates/show/host/node.def b/templates/show/host/node.def
new file mode 100644
index 0000000..65a0694
--- /dev/null
+++ b/templates/show/host/node.def
@@ -0,0 +1 @@
+help: Show host information
diff --git a/templates/show/host/os/node.def b/templates/show/host/os/node.def
new file mode 100644
index 0000000..1cfe2ec
--- /dev/null
+++ b/templates/show/host/os/node.def
@@ -0,0 +1,2 @@
+help: Show host operating system details
+run: /bin/uname -a
diff --git a/templates/show/system/boot-messages/all/node.def b/templates/show/system/boot-messages/all/node.def
index b151fc2..df6795f 100644
--- a/templates/show/system/boot-messages/all/node.def
+++ b/templates/show/system/boot-messages/all/node.def
@@ -1,2 +1,2 @@
 help: Show all kernel boot messages
-run: ${vyatta_bindir}/vyatta-show-dmesg-all
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-show-dmesg-all
diff --git a/templates/show/system/boot-messages/node.def b/templates/show/system/boot-messages/node.def
index fb24eeb..b2c25e3 100644
--- a/templates/show/system/boot-messages/node.def
+++ b/templates/show/system/boot-messages/node.def
@@ -1,2 +1,2 @@
 help: Show most recent kernel boot messages
-run: cat /var/log/dmes? /dev/null
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-show-dmesg
diff --git a/templates/show/users/node.def b/templates/show/users/node.def
new file mode 100644
index 0000000..6a88319
--- /dev/null
+++ b/templates/show/users/node.def
@@ -0,0 +1,2 @@
+help: Show user information
+run: who