Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Allow ssh/config to accept string, or array of strings #1129

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Allow ssh/config to accept string, or array of strings #1129

wants to merge 3 commits into from
+58 −4

Commits on Oct 28, 2024

  1. Actually pass ssh/config through to SSHKit options 

    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 returned in `#options`.
    @Burgestrand
    Burgestrand committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    e8a41af View commit details
    Browse the repository at this point in the history

  2. Allow ssh/config to additionally accept a string 

    This is accepted by Net::SSH, research done by @jeremy in basecamp#908 (comment)

This is already documented as working correctly in https://github.com/basecamp/kamal/blob/74a06b0ccda616c86ebe1729d0795f39bcac9f00/lib/kamal/configuration/docs/ssh.yml#L65-L70

However, before this change only booleans were allowed because of the example configuration file.
    @Burgestrand
    Burgestrand committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    3a634ae View commit details
    Browse the repository at this point in the history

  3. ssh/config does not accept an array of paths 

    `ssh -F` only accepts a single config file, and it's what we use for interactive commands, e.g. `kamal app logs --follow`.
    @Burgestrand
    Burgestrand committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    25a3f5d View commit details
    Browse the repository at this point in the history