Skip to content

Commit

Permalink
Merge pull request warewulf#1231 from mslacken/Fix1230
Browse files Browse the repository at this point in the history
Call SSH(keys) on configure --all
  • Loading branch information
anderbubble authored Jun 4, 2024
2 parents 69587b2 + 68ca922 commit 892db0f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Fix installation docs to use github.com/warewulf instead of github.com/hpcng. #1219
- Fix the issue that warewulf.conf parse does not support CIDR format. #1130
- Reduce the number of times syncuser walks the container file system. #1209
- Create ssh key also when calling `wwctl configure --all` #1250

### Security

Expand Down
3 changes: 2 additions & 1 deletion internal/app/wwctl/configure/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"os"

"github.com/spf13/cobra"
warewulfconf "github.com/warewulf/warewulf/internal/pkg/config"
"github.com/warewulf/warewulf/internal/pkg/configure"
"github.com/warewulf/warewulf/internal/pkg/wwlog"
)
Expand All @@ -23,7 +24,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
os.Exit(1)
}

err = configure.SSH()
err = configure.SSH(warewulfconf.Get().SSH.KeyTypes...)
if err != nil {
wwlog.Error("%s", err)
os.Exit(1)
Expand Down

0 comments on commit 892db0f

Please sign in to comment.