summaryrefslogtreecommitdiff
path: root/templates/show
diff options
context:
space:
mode:
authorMark O'Brien <mobrien@firebolt.vyatta.com>2008-07-09 13:44:09 -0700
committerMark O'Brien <mobrien@firebolt.vyatta.com>2008-07-09 13:44:09 -0700
commit12389b69ceff66a1642d28f904c1685b7421f719 (patch)
treea746e4f16180eac5644ffedef5bb610161f8d285 /templates/show
parent90567d603a6c9867b6b9cb93f185a46b88f5aef9 (diff)
parent06acbf6c67ae127378c14b646de3f66efca57a1c (diff)
downloadvyatta-op-12389b69ceff66a1642d28f904c1685b7421f719.tar.gz
vyatta-op-12389b69ceff66a1642d28f904c1685b7421f719.zip
Merge branch 'hollywood' of git:/git/vyatta-op into hollywood
Diffstat (limited to 'templates/show')
-rw-r--r--templates/show/files/node.tag/node.def2
-rw-r--r--templates/show/interfaces/tunnel/node.tag/capture/node.def2
-rw-r--r--templates/show/interfaces/tunnel/node.tag/capture/not/node.def1
-rw-r--r--templates/show/interfaces/tunnel/node.tag/capture/not/port/node.def1
-rw-r--r--templates/show/interfaces/tunnel/node.tag/capture/not/port/node.tag/node.def3
-rw-r--r--templates/show/interfaces/tunnel/node.tag/capture/port/node.def1
-rw-r--r--templates/show/interfaces/tunnel/node.tag/capture/port/node.tag/node.def3
-rw-r--r--templates/show/log/tail/node.tag/node.def2
8 files changed, 13 insertions, 2 deletions
diff --git a/templates/show/files/node.tag/node.def b/templates/show/files/node.tag/node.def
index 1734b2b..0448ad4 100644
--- a/templates/show/files/node.tag/node.def
+++ b/templates/show/files/node.tag/node.def
@@ -1,3 +1,3 @@
help: Show files in the specified directory
-allowed: echo -n *
+allowed: echo -n '<pathname>'
run: ls -lh "$3"
diff --git a/templates/show/interfaces/tunnel/node.tag/capture/node.def b/templates/show/interfaces/tunnel/node.tag/capture/node.def
new file mode 100644
index 0000000..b196a35
--- /dev/null
+++ b/templates/show/interfaces/tunnel/node.tag/capture/node.def
@@ -0,0 +1,2 @@
+help: Show captured traffic on specified tunnel interface
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
diff --git a/templates/show/interfaces/tunnel/node.tag/capture/not/node.def b/templates/show/interfaces/tunnel/node.tag/capture/not/node.def
new file mode 100644
index 0000000..c957f71
--- /dev/null
+++ b/templates/show/interfaces/tunnel/node.tag/capture/not/node.def
@@ -0,0 +1 @@
+help: Show captured traffic excluding the specified tunnel interface port
diff --git a/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.def b/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.def
new file mode 100644
index 0000000..c957f71
--- /dev/null
+++ b/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.def
@@ -0,0 +1 @@
+help: Show captured traffic excluding the specified tunnel interface port
diff --git a/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.tag/node.def b/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.tag/node.def
new file mode 100644
index 0000000..b5c87c9
--- /dev/null
+++ b/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show captured traffic excluding the specified tunnel interface port
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4" "$8" 1
+allowed: echo -n '<1-65535>'
diff --git a/templates/show/interfaces/tunnel/node.tag/capture/port/node.def b/templates/show/interfaces/tunnel/node.tag/capture/port/node.def
new file mode 100644
index 0000000..ed3b544
--- /dev/null
+++ b/templates/show/interfaces/tunnel/node.tag/capture/port/node.def
@@ -0,0 +1 @@
+help: Show captured traffic on specified tunnel interface port
diff --git a/templates/show/interfaces/tunnel/node.tag/capture/port/node.tag/node.def b/templates/show/interfaces/tunnel/node.tag/capture/port/node.tag/node.def
new file mode 100644
index 0000000..d1f01df
--- /dev/null
+++ b/templates/show/interfaces/tunnel/node.tag/capture/port/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show captured traffic on specified tunnel interface port
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4" "$7" 0
+allowed: echo -n '<1-65535>'
diff --git a/templates/show/log/tail/node.tag/node.def b/templates/show/log/tail/node.tag/node.def
index 00de686..b07bb9e 100644
--- a/templates/show/log/tail/node.tag/node.def
+++ b/templates/show/log/tail/node.tag/node.def
@@ -1,3 +1,3 @@
help: Show last changes to messages
allowed: echo -n '<NUMBER>'
-run: tail -n "$4" /var/log/messages
+run: tail -n "$4" /var/log/messages | ${VYATTA_PAGER:-cat}