summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Göhler <github@ghlr.de>2024-08-29 22:33:10 +0200
committerGitHub <noreply@github.com>2024-08-29 22:33:10 +0200
commit4d987ff267b262375520c4596509b1d0c656104f (patch)
treedb6dcee237ec0b1e9fcd1ba994dad4af534f6f14
parent4d6e71ea0338a7c9d3a4bc279f65189ecb109bb6 (diff)
parentbef6d321e34a0325db0dc742afe802b1aa1c7f5c (diff)
downloadvyos-documentation-4d987ff267b262375520c4596509b1d0c656104f.tar.gz
vyos-documentation-4d987ff267b262375520c4596509b1d0c656104f.zip
Merge pull request #1532 from vyos/mergify/bp/sagitta/pr-1531mergify/bp/sagitta/pr-1533
Update ssh and ntp documentation (backport #1531)
-rw-r--r--docs/configuration/service/ntp.rst3
-rw-r--r--docs/configuration/service/ssh.rst5
2 files changed, 5 insertions, 3 deletions
diff --git a/docs/configuration/service/ntp.rst b/docs/configuration/service/ntp.rst
index 266376cf..f82baa34 100644
--- a/docs/configuration/service/ntp.rst
+++ b/docs/configuration/service/ntp.rst
@@ -71,7 +71,8 @@ Configuration
NTP process will only listen on the specified IP address. You must specify
the `<address>` and optionally the permitted clients. Multiple listen
- addresses can be configured.
+ addresses for same IP family is no longer supported. Only one IPv4 and one
+ IPv6 address can be configured, using separate commands for each.
.. cfgcmd:: set service ntp allow-client address <address>
diff --git a/docs/configuration/service/ssh.rst b/docs/configuration/service/ssh.rst
index efdbc651..bb76e3d9 100644
--- a/docs/configuration/service/ssh.rst
+++ b/docs/configuration/service/ssh.rst
@@ -64,11 +64,12 @@ Configuration
Disable the host validation through reverse DNS lookups - can speedup login
time when reverse lookup is not possible.
-.. cfgcmd:: set service ssh macs <mac>
+.. cfgcmd:: set service ssh mac <mac>
Specifies the available :abbr:`MAC (Message Authentication Code)` algorithms.
The MAC algorithm is used in protocol version 2 for data integrity protection.
- Multiple algorithms can be provided.
+ Multiple algorithms can be provided by using multiple commands, defining
+ one algorithm per command.
List of supported MACs: ``hmac-md5``, ``hmac-md5-96``, ``hmac-ripemd160``,
``hmac-sha1``, ``hmac-sha1-96``, ``hmac-sha2-256``, ``hmac-sha2-512``,