Skip to content

Commit

Permalink
Do not ask for a password if only a publickey script is defined (fix #72
Browse files Browse the repository at this point in the history
)
  • Loading branch information
moul committed May 26, 2016
1 parent e6845af commit efcbe1a
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions server.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ func (s *Server) Init() error {
return nil
}

// disable password authentication
if s.PasswordAuthScript == "" && s.PublicKeyAuthScript != "" {
s.SshConfig.PasswordCallback = nil
}

// cleanup old containers
if s.CleanOnStartup {
err := dockerhelper.DockerCleanup()
if err != nil {
Expand Down

0 comments on commit efcbe1a

Please sign in to comment.