make created ssh keys configureable

Signed-off-by: Christian Goll <cgoll@suse.com>

etc/warewulf.conf

@@ -38,3 +38,9 @@ container mounts:
   - source: /etc/resolv.conf
     dest: /etc/resolv.conf
     readonly: true
+ssh:
+  key types:
+    - rsa
+    - dsa
+    - ecdsa
+    - ed25519

internal/app/wwctl/configure/root.go

@@ -28,7 +28,7 @@ func init() {
 	baseCmd.AddCommand(nfs.GetCommand())
 	baseCmd.AddCommand(hostfile.GetCommand())
 
-	baseCmd.PersistentFlags().BoolVarP(&allFunctions, "all", "a", false, "Configure all services")
+	baseCmd.Flags().BoolVarP(&allFunctions, "all", "a", false, "Configure all services")
 }
 
 // GetRootCommand returns the root cobra.Command for the application.

internal/app/wwctl/configure/ssh/main.go

@@ -2,9 +2,13 @@ package ssh
 
 import (
 	"github.com/spf13/cobra"
+	warewulfconf "github.com/warewulf/warewulf/internal/pkg/config"
 	"github.com/warewulf/warewulf/internal/pkg/configure"
 )
 
 func CobraRunE(cmd *cobra.Command, args []string) error {
+	if len(keyTypes) == 0 {
+		keyTypes = append(keyTypes, warewulfconf.Get().SSH.KeyTypes...)
+	}
 	return configure.SSH(keyTypes...)
 }

internal/app/wwctl/configure/ssh/root.go

@@ -1,6 +1,8 @@
 package ssh
 
-import "github.com/spf13/cobra"
+import (
+	"github.com/spf13/cobra"
+)
 
 var (
 	baseCmd = &cobra.Command{
@@ -20,6 +22,6 @@ func init() {
 
 // GetRootCommand returns the root cobra.Command for the application.
 func GetCommand() *cobra.Command {
-	baseCmd.PersistentFlags().StringArrayVarP(&keyTypes, "keytypes", "t", []string{"rsa", "dsa", "ecdsa", "ed25519"}, "ssh key types to be created")
+	baseCmd.PersistentFlags().StringArrayVarP(&keyTypes, "keytypes", "t", []string{}, "ssh key types to be created")
 	return baseCmd
 }

internal/pkg/config/root.go

@@ -38,6 +38,7 @@ type RootConf struct {
 	DHCP            *DHCPConf     `yaml:"dhcp"`
 	TFTP            *TFTPConf     `yaml:"tftp"`
 	NFS             *NFSConf      `yaml:"nfs"`
+	SSH             *SSHConf      `yaml:"ssh,omitempty"`
 	MountsContainer []*MountEntry `yaml:"container mounts" default:"[{\"source\": \"/etc/resolv.conf\", \"dest\": \"/etc/resolv.conf\"}]"`
 	Paths           *BuildConfig  `yaml:"paths"`
 
@@ -53,6 +54,7 @@ func New() *RootConf {
 	cachedConf.DHCP = new(DHCPConf)
 	cachedConf.TFTP = new(TFTPConf)
 	cachedConf.NFS = new(NFSConf)
+	cachedConf.SSH = new(SSHConf)
 	cachedConf.Paths = new(BuildConfig)
 	if err := defaults.Set(&cachedConf); err != nil {
 		panic(err)

internal/pkg/config/ssh.go

@@ -0,0 +1,5 @@
+package config
+
+type SSHConf struct {
+	KeyTypes []string `yaml:"key types" default:"[\"rsa\",\"dsa\",\"ecdsa\",\"ed25519\"]"`
+}