Skip to content

feat: allow specifying SSH config path via a daemon environment variable #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/agent/transport/ssh/transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ func (t *sshTransport) Command(command string) (*exec.Cmd, error) {
// more efficient to compress at that layer, even with the slower Go
// implementation.
var sshArguments []string
if configPath := os.Getenv("MUTAGEN_SSH_CONFIG_PATH"); configPath != "" {
// According to `man ssh`, "none" is also a valid value for `-F`
sshArguments = append(sshArguments, "-F", configPath)
}
sshArguments = append(sshArguments, ssh.ConnectTimeoutFlag(connectTimeoutSeconds))
sshArguments = append(sshArguments, ssh.ServerAliveFlags(serverAliveIntervalSeconds, serverAliveCountMax)...)
if t.port != 0 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/mutagen/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const (
// VersionMinor represents the current minor version of Mutagen.
VersionMinor = 18
// VersionPatch represents the current patch version of Mutagen.
VersionPatch = 2
VersionPatch = 3
// VersionTag represents a tag to be appended to the Mutagen version string.
// It must not contain spaces. If empty, no tag is appended to the version
// string.
Expand Down
2 changes: 1 addition & 1 deletion pkg/process/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const (
// windowsPowershellCommandNotFoundFragment is a fragment of the error output
// returned on Windows systems running Powershell when a command cannot be
// found.
// Different Windows versions use slightly error messages.
// Different Windows versions use slightly different error messages.
// i.e. "is not recognized as the name of a cmdlet, function, script file, or operable program."
// "is not recognized as a name of a cmdlet, function, script file, or executable program."
windowsPowershellCommandNotFoundFragment = "cmdlet, function, script file, or"
Expand Down
Loading