Merge branch 'current' into lithiumlithium

Conflicts:
	Makefile.am
	debian/changelog
	templates/restart/dns/forwarding/node.def
	templates/show/version/added/node.def
	templates/show/version/all/node.def
	templates/show/version/deleted/node.def
	templates/show/version/downgraded/node.def
	templates/show/version/node.def
	templates/show/version/upgraded/node.def

19 files changed, 0 insertions, 43 deletions

diff --git a/templates/show/snmp/community/node.def b/templates/show/snmp/community/node.def
deleted file mode 100644
index 48e7d1d..0000000
--- a/templates/show/snmp/community/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show status of SNMP community
diff --git a/templates/show/snmp/community/node.tag/host/node.def b/templates/show/snmp/community/node.tag/host/node.def
deleted file mode 100644
index ac7e559..0000000
--- a/templates/show/snmp/community/node.tag/host/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show status of SNMP on remote host
-
diff --git a/templates/show/snmp/community/node.tag/host/node.tag/node.def b/templates/show/snmp/community/node.tag/host/node.tag/node.def
deleted file mode 100644
index b20409d..0000000
--- a/templates/show/snmp/community/node.tag/host/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Show status of SNMP on specified host
-allowed: echo -n '<hostname> <x.x.x.x>'
-run: ${vyatta_bindir}/vyatta-show-snmp.pl --community $4 --host $6
diff --git a/templates/show/snmp/community/node.tag/node.def b/templates/show/snmp/community/node.tag/node.def
deleted file mode 100644
index 48aa6ad..0000000
--- a/templates/show/snmp/community/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Show status of specified SNMP community
-allowed: ${vyatta_bindir}/vyatta-show-snmp.pl --allowed
-run: ${vyatta_bindir}/vyatta-show-snmp.pl --community="$4"
diff --git a/templates/show/snmp/mib/ifmib/ifAlias/node.def b/templates/show/snmp/mib/ifmib/ifAlias/node.def
deleted file mode 100644
index 91a0aa0..0000000
--- a/templates/show/snmp/mib/ifmib/ifAlias/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show SNMP ifAlias for all interfaces
-run: ${vyatta_bindir}/vyatta-show-snmp-ifmib --ifalias
diff --git a/templates/show/snmp/mib/ifmib/ifAlias/node.tag/node.def b/templates/show/snmp/mib/ifmib/ifAlias/node.tag/node.def
deleted file mode 100644
index 6c5b00a..0000000
--- a/templates/show/snmp/mib/ifmib/ifAlias/node.tag/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show SNMP ifAlias for specified interface
-run: ${vyatta_bindir}/vyatta-show-snmp-ifmib --ifalias $6
diff --git a/templates/show/snmp/mib/ifmib/ifDescr/node.def b/templates/show/snmp/mib/ifmib/ifDescr/node.def
deleted file mode 100644
index 6ec827d..0000000
--- a/templates/show/snmp/mib/ifmib/ifDescr/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show SNMP ifDescr for all interfaces
-run: ${vyatta_bindir}/vyatta-show-snmp-ifmib --ifdescr
diff --git a/templates/show/snmp/mib/ifmib/ifDescr/node.tag/node.def b/templates/show/snmp/mib/ifmib/ifDescr/node.tag/node.def
deleted file mode 100644
index 95222de..0000000
--- a/templates/show/snmp/mib/ifmib/ifDescr/node.tag/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show SNMP ifDescr for specified interface
-run: ${vyatta_bindir}/vyatta-show-snmp-ifmib --ifdescr $6
diff --git a/templates/show/snmp/mib/ifmib/ifIndex/node.def b/templates/show/snmp/mib/ifmib/ifIndex/node.def
deleted file mode 100644
index 2955c1d..0000000
--- a/templates/show/snmp/mib/ifmib/ifIndex/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show SNMP ifIndex for all interfaces
-run: ${vyatta_bindir}/vyatta-show-snmp-ifmib --ifindex
diff --git a/templates/show/snmp/mib/ifmib/ifIndex/node.tag/node.def b/templates/show/snmp/mib/ifmib/ifIndex/node.tag/node.def
deleted file mode 100644
index f9159ac..0000000
--- a/templates/show/snmp/mib/ifmib/ifIndex/node.tag/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show SNMP ifIndex for specified interface
-run: ${vyatta_bindir}/vyatta-show-snmp-ifmib --ifindex $6
diff --git a/templates/show/snmp/mib/ifmib/node.def b/templates/show/snmp/mib/ifmib/node.def
deleted file mode 100644
index fa309ff..0000000
--- a/templates/show/snmp/mib/ifmib/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show SNMP interfaces MIB information
-run: ${vyatta_bindir}/vyatta-show-snmp-ifmib
diff --git a/templates/show/snmp/mib/node.def b/templates/show/snmp/mib/node.def
deleted file mode 100644
index de4f01b..0000000
--- a/templates/show/snmp/mib/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show SNMP MIB information
diff --git a/templates/show/snmp/node.def b/templates/show/snmp/node.def
deleted file mode 100644
index 98f4366..0000000
--- a/templates/show/snmp/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show status of SNMP on localhost
-run: ${vyatta_bindir}/vyatta-show-snmp.pl
diff --git a/templates/show/snmp/v3/certificates/node.def b/templates/show/snmp/v3/certificates/node.def
deleted file mode 100644
index e66fc0d..0000000
--- a/templates/show/snmp/v3/certificates/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: Show TSM certificates
-run: files=`sudo ls /etc/snmp/tls/certs/ 2> /dev/null`;
-  if [ -n "$files" ]; then
-    sudo /usr/bin/net-snmp-cert showcerts --subject --fingerprint
-  else
-    echo "You don't have any certificates. Put it in '/etc/snmp/tls/certs/' folder."
-  fi
diff --git a/templates/show/snmp/v3/group/node.def b/templates/show/snmp/v3/group/node.def
deleted file mode 100644
index 7ff947a..0000000
--- a/templates/show/snmp/v3/group/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show the list of configured groups
-run: /opt/vyatta/bin/vyatta-show-snmp-v3.pl --group
\ No newline at end of file
diff --git a/templates/show/snmp/v3/node.def b/templates/show/snmp/v3/node.def
deleted file mode 100644
index 70c0df2..0000000
--- a/templates/show/snmp/v3/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show status of SNMP v3 on localhost
-run: /opt/vyatta/bin/vyatta-show-snmp-v3.pl --all
\ No newline at end of file
diff --git a/templates/show/snmp/v3/trap-target/node.def b/templates/show/snmp/v3/trap-target/node.def
deleted file mode 100644
index 9f0d2f1..0000000
--- a/templates/show/snmp/v3/trap-target/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show the list of configured targets
-run: /opt/vyatta/bin/vyatta-show-snmp-v3.pl --trap
diff --git a/templates/show/snmp/v3/user/node.def b/templates/show/snmp/v3/user/node.def
deleted file mode 100644
index 621ccc8..0000000
--- a/templates/show/snmp/v3/user/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show the list of configured users
-run: /opt/vyatta/bin/vyatta-show-snmp-v3.pl --user
diff --git a/templates/show/snmp/v3/view/node.def b/templates/show/snmp/v3/view/node.def
deleted file mode 100644
index 7e05d84..0000000
--- a/templates/show/snmp/v3/view/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show the list of configured views
-run: /opt/vyatta/bin/vyatta-show-snmp-v3.pl --view
\ No newline at end of file