summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-09-12 20:12:58 +0200
committerChristian Poessinger <christian@poessinger.com>2021-09-12 20:12:58 +0200
commite092ea4321510c690a51b87a9f7b3eff1fc6ed72 (patch)
tree9cb3619cc46a242887a4c3748ab3a2df6626af9f
parentebf89e0535cf8362a077c07a9cfa2dbd8eeecbb4 (diff)
downloadvyos-1x-e092ea4321510c690a51b87a9f7b3eff1fc6ed72.tar.gz
vyos-1x-e092ea4321510c690a51b87a9f7b3eff1fc6ed72.zip
pki: T3642: show only requested certificate in op-mode
-rw-r--r--op-mode-definitions/pki.xml.in32
1 files changed, 15 insertions, 17 deletions
diff --git a/op-mode-definitions/pki.xml.in b/op-mode-definitions/pki.xml.in
index 70154f881..75ef92d19 100644
--- a/op-mode-definitions/pki.xml.in
+++ b/op-mode-definitions/pki.xml.in
@@ -353,41 +353,39 @@
<children>
<node name="pki">
<properties>
- <help>Show PKI certificates</help>
+ <help>Show PKI x509 certificates</help>
</properties>
<children>
<leafNode name="ca">
<properties>
- <help>Show CA certificates</help>
+ <help>Show x509 CA certificates</help>
</properties>
<command>sudo ${vyos_op_scripts_dir}/pki.py --action show --ca "all"</command>
</leafNode>
<tagNode name="ca">
<properties>
- <help>Show CA certificate by name</help>
+ <help>Show x509 CA certificate by name</help>
<completionHelp>
<path>pki ca</path>
</completionHelp>
</properties>
<command>sudo ${vyos_op_scripts_dir}/pki.py --action show --ca "$4"</command>
</tagNode>
- <node name="certificate">
+ <leafNode name="certificate">
<properties>
- <help>Show certificates</help>
+ <help>Show x509 certificates</help>
</properties>
- <children>
- <leafNode name="name">
- <properties>
- <help>Show certificate by name</help>
- <completionHelp>
- <path>pki certificate</path>
- </completionHelp>
- </properties>
- <command>sudo ${vyos_op_scripts_dir}/pki.py --action show --certificate "$5"</command>
- </leafNode>
- </children>
<command>sudo ${vyos_op_scripts_dir}/pki.py --action show --certificate "all"</command>
- </node>
+ </leafNode>
+ <tagNode name="certificate">
+ <properties>
+ <help>Show x509 certificate by name</help>
+ <completionHelp>
+ <path>pki certificate</path>
+ </completionHelp>
+ </properties>
+ <command>sudo ${vyos_op_scripts_dir}/pki.py --action show --certificate "all"</command>
+ </tagNode>
<node name="crl">
<properties>
<help>Show certificate revocation lists</help>