Skip to content

Commit f924b68

Browse files
committed
Actually pass ssh/config through to SSHKit options
This option is documented as available since #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.
1 parent 74a06b0 commit f924b68

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

lib/kamal/configuration/ssh.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,12 @@ def key_data
3838
ssh_config["key_data"]
3939
end
4040

41+
def config
42+
ssh_config["config"]
43+
end
44+
4145
def options
42-
{ user: user, port: port, proxy: proxy, logger: logger, keepalive: true, keepalive_interval: 30, keys_only: keys_only, keys: keys, key_data: key_data }.compact
46+
{ 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
4347
end
4448

4549
def to_h

0 commit comments

Comments
 (0)