loadkey is to be completely removed from 1.4

This commit is contained in:
erkin 2023-01-18 19:38:52 +03:00
parent f8431a4698
commit 5edfbeee62
2 changed files with 5 additions and 19 deletions

View File

@ -139,6 +139,8 @@ offending IP is blocked. Offenders are unblocked after a set interval.
Block source IP when their cumulative attack score exceeds threshold. The Block source IP when their cumulative attack score exceeds threshold. The
default is 30. default is 30.
.. _ssh_operation:
Operation Operation
========= =========
@ -193,7 +195,7 @@ Operation
:ref:`ssh_key_based_authentication`. :ref:`ssh_key_based_authentication`.
``<location>`` can be a local path or a URL pointing at a remote file. ``<location>`` can be a local path or a URL pointing at a remote file.
Supported remote protocols are FTP, HTTP, HTTPS, SCP/SFTP and TFTP. Supported remote protocols are FTP, FTPS, HTTP, HTTPS, SCP/SFTP and TFTP.
Example: Example:

View File

@ -54,6 +54,8 @@ and paste it. Some terminal emulators may accidentally split this over several
lines. Be attentive when you paste it that it only pastes as a single line. lines. Be attentive when you paste it that it only pastes as a single line.
The third part is simply an identifier, and is for your own reference. The third part is simply an identifier, and is for your own reference.
.. seealso:: SSH :ref:`ssh_operation`
.. cfgcmd:: set system login user <username> authentication public-keys .. cfgcmd:: set system login user <username> authentication public-keys
<identifier> key <key> <identifier> key <key>
@ -85,24 +87,6 @@ The third part is simply an identifier, and is for your own reference.
``from=&quot;10.0.0.0/24&quot;`` to restrict where the user ``from=&quot;10.0.0.0/24&quot;`` to restrict where the user
may connect from when using this key. may connect from when using this key.
.. cfgcmd:: loadkey <username> <location>
**Deprecation notice:** ``loadkey`` has been deprecated in favour of
:opcmd:`generate public-key-commands` and will be removed in a future
version. See :ref:`ssh`.
SSH keys can not only be specified on the command-line but also loaded for
a given user with `<username>` from a file pointed to by `<location>.` Keys
can be either loaded from local filesystem or any given remote location
using one of the following :abbr:`URIs (Uniform Resource Identifier)`:
* ``<file>`` - Load from file on local filesystem path
* ``scp://<user>@<host>:/<file>`` - Load via SCP from remote machine
* ``sftp://<user>@<host>/<file>`` - Load via SFTP from remote machine
* ``ftp://<user>@<host>/<file>`` - Load via FTP from remote machine
* ``http://<host>/<file>`` - Load via HTTP from remote machine
* ``tftp://<host>/<file>`` - Load via TFTP from remote machine
MFA/2FA authentication using OTP (one time passwords) MFA/2FA authentication using OTP (one time passwords)
----------------------------------------------------- -----------------------------------------------------