diff options
author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:20:39 +0200 |
---|---|---|
committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:20:39 +0200 |
commit | 997291b8a6a66953c6a6270c2dda323769452581 (patch) | |
tree | da24c0099caede14445289dca8d76560c08de1d9 /templates/show/tech-support/save-uncompressed | |
parent | 3610a467094e80a39b6627f6b7655430917b9bd3 (diff) | |
parent | add153b13de56f97624b2dc433fdbe21b36dbeed (diff) | |
download | vyatta-op-lithium.tar.gz vyatta-op-lithium.zip |
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
Diffstat (limited to 'templates/show/tech-support/save-uncompressed')
-rw-r--r-- | templates/show/tech-support/save-uncompressed/node.def | 4 | ||||
-rw-r--r-- | templates/show/tech-support/save-uncompressed/node.tag/node.def | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/templates/show/tech-support/save-uncompressed/node.def b/templates/show/tech-support/save-uncompressed/node.def index 4036eaf..4d828f1 100644 --- a/templates/show/tech-support/save-uncompressed/node.def +++ b/templates/show/tech-support/save-uncompressed/node.def @@ -1,7 +1,7 @@ -help: Save consolidated tech-support report uncompressed +help: Save consolidated tech-support report uncompressed (private information removed) run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; then - source ${vyatta_datadir}/vyatta-op/functions/tech-support save-uncompressed + source ${vyatta_datadir}/vyatta-op/functions/tech-support save-uncompressed | strip-private else echo Must be an admin user to run this command. fi diff --git a/templates/show/tech-support/save-uncompressed/node.tag/node.def b/templates/show/tech-support/save-uncompressed/node.tag/node.def index 8a637c6..4006afe 100644 --- a/templates/show/tech-support/save-uncompressed/node.tag/node.def +++ b/templates/show/tech-support/save-uncompressed/node.tag/node.def @@ -1,8 +1,8 @@ -help: Save uncompressed tech-support report to specified path/file +help: Save uncompressed tech-support report to specified path/file (private information removed) allowed: echo -n '<file> <scp://<user>:<passwd>@<host>/<file>> <ftp://<user>:<passwd>@<host>/<file>>' run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; then - source ${vyatta_datadir}/vyatta-op/functions/tech-support save-uncompressed $4 + source ${vyatta_datadir}/vyatta-op/functions/tech-support save-uncompressed $4 | strip-private else echo Must be an admin user to run this command fi |