diff options
author | Christian Poessinger <christian@poessinger.com> | 2021-01-29 10:46:35 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2021-01-29 10:46:35 +0100 |
commit | cb52204292838ba8dd6315ff123595c96883190d (patch) | |
tree | 66314433752eda7cf3bd76c36a75237a02ee97a4 /op-mode-definitions | |
parent | 1e62e5e264f60b2e21a4855e264a5bcc8fdc32da (diff) | |
parent | ca75e23fee7e4c9f809e5cabf158e9aa749c997d (diff) | |
download | vyos-1x-cb52204292838ba8dd6315ff123595c96883190d.tar.gz vyos-1x-cb52204292838ba8dd6315ff123595c96883190d.zip |
Merge branch 't3255-rpki' of github.com:c-po/vyos-1x into current
* 't3255-rpki' of github.com:c-po/vyos-1x:
rpki: T3255: provide full protocol support in XML and Python
op-mode: ssh: support generating client keypair
smoketest: openvpn: remove print() when generating keys
Diffstat (limited to 'op-mode-definitions')
-rw-r--r-- | op-mode-definitions/generate-ssh-server-key.xml.in | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/op-mode-definitions/generate-ssh-server-key.xml.in b/op-mode-definitions/generate-ssh-server-key.xml.in index a6ebf1b78..86bb1b1bd 100644 --- a/op-mode-definitions/generate-ssh-server-key.xml.in +++ b/op-mode-definitions/generate-ssh-server-key.xml.in @@ -2,14 +2,30 @@ <interfaceDefinition> <node name="generate"> <properties> - <help>Generate an object</help> + <help>Generate an object/key</help> </properties> <children> - <node name="ssh-server-key"> + <node name="ssh"> <properties> - <help>Regenerate the host SSH keys and restart the SSH server</help> + <help>Generate SSH related keypairs</help> </properties> - <command>${vyos_op_scripts_dir}/generate_ssh_server_key.py</command> + <children> + <node name="server-key"> + <properties> + <help>Re-generate SSH host keys and restart SSH server</help> + </properties> + <command>${vyos_op_scripts_dir}/generate_ssh_server_key.py</command> + </node> + <tagNode name="client-key"> + <properties> + <help>Re-generate SSH client keypair</help> + <completionHelp> + <list><filename></list> + </completionHelp> + </properties> + <command>ssh-keygen -t rsa -f "$4" -N ""</command> + </tagNode> + </children> </node> </children> </node> |