kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

make created ssh keys configureable

Browse Source 
Signed-off-by: Christian Goll <cgoll@suse.com>
This commit is contained in:
Christian Goll
2024-04-15 12:06:43 +02:00
committed by Jonathon Anderson
parent ad6699c110
commit 21150d2975
6 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/app/wwctl/configure/root.go
View File

@@ -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.

4
internal/app/wwctl/configure/ssh/main.go
View File

@@ -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...)
}

6
internal/app/wwctl/configure/ssh/root.go
View File

@@ -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
}