haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for SSH config file to Rsync helper

This commit is contained in:
Gavin Williams 2018-09-27 16:16:03 +01:00 committed by Chris Roberts
parent 9d72feb36c
commit 0500f2b9b3
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/synced_folders/rsync/helper.rb
View File

@ -77,6 +77,11 @@ module VagrantPlugins
proxy_command = "-o ProxyCommand='#{ssh_info[:proxy_command]}' " proxy_command = "-o ProxyCommand='#{ssh_info[:proxy_command]}' "
end end
ssh_config_file = ""
if ssh_info[:config]
ssh_config_file = "-F #{ssh_info[:config]}"
end
# Create the path for the control sockets. We used to do this # Create the path for the control sockets. We used to do this
# in the machine data dir but this can result in paths that are # in the machine data dir but this can result in paths that are
# too long for unix domain sockets. # too long for unix domain sockets.
@ -91,6 +96,7 @@ module VagrantPlugins
"ssh", "-p", "#{ssh_info[:port]}", "ssh", "-p", "#{ssh_info[:port]}",
"-o", "LogLevel=#{log_level}", "-o", "LogLevel=#{log_level}",
proxy_command, proxy_command,
ssh_config_file,
control_options, control_options,
] ]