diff options
| author | Daniil Baturin <daniil@vyos.io> | 2023-01-18 16:43:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-18 16:43:22 +0000 |
| commit | e6c10962c1b4573c59a38fca440ca628d45954e6 (patch) | |
| tree | 9de3c75e6fc24b49c283dbf838ed6bd384445005 | |
| parent | f8431a4698493518322ef53eda878aaa640dc3f2 (diff) | |
| parent | 5edfbeee62f9352c117ec84b0c8a8fd86ab86708 (diff) | |
| download | vyos-documentation-e6c10962c1b4573c59a38fca440ca628d45954e6.tar.gz vyos-documentation-e6c10962c1b4573c59a38fca440ca628d45954e6.zip | |
Merge pull request #929 from erkin/master
loadkey is to be completely removed from 1.4
| -rw-r--r-- | docs/configuration/service/ssh.rst | 4 | ||||
| -rw-r--r-- | docs/configuration/system/login.rst | 20 |
2 files changed, 5 insertions, 19 deletions
diff --git a/docs/configuration/service/ssh.rst b/docs/configuration/service/ssh.rst index ab77c138..5eaa971f 100644 --- a/docs/configuration/service/ssh.rst +++ b/docs/configuration/service/ssh.rst @@ -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 default is 30. +.. _ssh_operation: + Operation ========= @@ -193,7 +195,7 @@ Operation :ref:`ssh_key_based_authentication`. ``<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: diff --git a/docs/configuration/system/login.rst b/docs/configuration/system/login.rst index c4cc232d..a5c1b558 100644 --- a/docs/configuration/system/login.rst +++ b/docs/configuration/system/login.rst @@ -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. 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 <identifier> key <key> @@ -85,24 +87,6 @@ The third part is simply an identifier, and is for your own reference. ``from="10.0.0.0/24"`` to restrict where the user 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) ----------------------------------------------------- |