Skip to content

Commit

Permalink
Actually pass ssh/config through to SSHKit options
Browse files Browse the repository at this point in the history
This option is documented as available since basecamp#908 in:
https://github.com/basecamp/kamal/blob/74a06b0ccda616c86ebe1729d0795f39bcac9f00/lib/kamal/configuration/docs/ssh.yml#L65-L70

However, before this the options don't seem to pass through to SSHKit:
https://github.com/basecamp/kamal/blob/74a06b0ccda616c86ebe1729d0795f39bcac9f00/lib/kamal/commander.rb#L167

Since `config` isn't actually return in this hash.
  • Loading branch information
Burgestrand committed Oct 17, 2024
1 parent 74a06b0 commit f924b68
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion lib/kamal/configuration/ssh.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,12 @@ def key_data
ssh_config["key_data"]
end

def config
ssh_config["config"]
end

def options
{ user: user, port: port, proxy: proxy, logger: logger, keepalive: true, keepalive_interval: 30, keys_only: keys_only, keys: keys, key_data: key_data }.compact
{ user: user, port: port, proxy: proxy, logger: logger, keepalive: true, keepalive_interval: 30, keys_only: keys_only, keys: keys, key_data: key_data, config: config }.compact
end

def to_h
Expand Down

0 comments on commit f924b68

Please sign in to comment.