From a164498aa55bd94ef05293356f01cfbd54787d23 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Fri, 19 Apr 2024 19:17:42 -0600 Subject: [PATCH] Documentation for SSH key type configuration Signed-off-by: Jonathon Anderson --- .../rootfs/warewulf/template-variables.md.ww | 9 +++++++ userdocs/contents/configuration.rst | 25 +++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/overlays/debug/rootfs/warewulf/template-variables.md.ww b/overlays/debug/rootfs/warewulf/template-variables.md.ww index 1a2940eb..8b2e96cd 100644 --- a/overlays/debug/rootfs/warewulf/template-variables.md.ww +++ b/overlays/debug/rootfs/warewulf/template-variables.md.ww @@ -108,6 +108,15 @@ data from other structures. - Mount: {{ $export.Mount }} {{- end }} +### SSH + +{{- if gt (len .Ssh.KeyTypes) 0 }} +- Key types: +{{- range $index, $keyType := .Ssh.KeyTypes }} + - {{ $keyType }} +{{- end }} +- First key type: {{ index .Ssh.KeyTypes 0 }} +{{- end }} ### Warewulf diff --git a/userdocs/contents/configuration.rst b/userdocs/contents/configuration.rst index a16edefc..e16549fa 100644 --- a/userdocs/contents/configuration.rst +++ b/userdocs/contents/configuration.rst @@ -49,6 +49,12 @@ Warewulf (4.5.1): - source: /etc/resolv.conf dest: /etc/resolv.conf readonly: true + ssh: + key types: + - rsa + - dsa + - ecdsa + - ed25519 Generally you can leave this file as is, as long as you set the appropriate networking information. Specifically the following @@ -151,6 +157,25 @@ may be overridden using ``warewulf.conf:paths``. * ``wwclientdir``: Where the Warewulf client looks for its configuration on a provisioned node. +SSH key types +------------- + +*New in Warewulf v4.5.1* + +SSH key types to generate during ``wwctl configure ssh`` may be overridden using ``warewulf.conf:ssh:key types``. + +.. code-block:: yaml + + ssh: + key types: + - rsa + - dsa + - ecdsa + - ed25519 + +Warewulf will generate host keys for each listed key type. +The first listed key type is used to generate authentication ssh keys. + nodes.conf ==========