use port from config file; if no port specified from config or cli, t… #84
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jackc
requested changes
Aug 5, 2023
main.go
Outdated
|
|
||
| if keyfile, ok := file.Get("ssh-tunnel", "keyfile"); ok { | ||
| config.SSHConnConfig.KeyFile = keyfile | ||
| } | ||
| return nil |
There was a problem hiding this comment.
I'm guessing this was inadvertently included from another commit?
There was a problem hiding this comment.
Ah yep was looking at also adding a key file option to support things like vagrant easier
There was a problem hiding this comment.
updated d08e1b7
main.go
Outdated
| @@ -968,7 +968,7 @@ func LoadConfig() (*Config, error) { | |||
| } | |||
|
|
|||
| if config.SSHConnConfig.Port == "" { | |||
| config.SSHConnConfig.Port = "ssh" | |||
| config.SSHConnConfig.Port = "22" | |||
There was a problem hiding this comment.
This doesn't matter. Go looks up port service names and translates to the numerical value.
There was a problem hiding this comment.
updated d08e1b7
michaelknowles
force-pushed
the
sshPortFromConfig
branch
from
e795465
to
561b43e
Compare
…hen default to 22
michaelknowles
force-pushed
the
sshPortFromConfig
branch
from
561b43e
to
d08e1b7
Compare
jackc
approved these changes
Aug 7, 2023
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…hen default to 22