summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2012-10-30 13:06:05 -0700
committerelijah <elijah@riseup.net>2012-10-30 13:06:05 -0700
commit753d0049a2dd952eab47df89175611298d7f8755 (patch)
treea5e515bb2d6b8eac6414739ecb3a5db7e383d5be
parentf8c98e7e15a92efdf384f6e4074df8c0d005871a (diff)
use GlobalKnownHostsFile for rsync and ssh instead of UserKnownHostsFile.
-rw-r--r--lib/leap_cli/commands/shell.rb2
-rw-r--r--lib/leap_cli/commands/util.rb2
-rw-r--r--vendor/supply_drop/lib/supply_drop/rsync.rb1
3 files changed, 3 insertions, 2 deletions
diff --git a/lib/leap_cli/commands/shell.rb b/lib/leap_cli/commands/shell.rb
index 8101904..a84c671 100644
--- a/lib/leap_cli/commands/shell.rb
+++ b/lib/leap_cli/commands/shell.rb
@@ -5,7 +5,7 @@ module LeapCli; module Commands
command :shell, :ssh do |c|
c.action do |global_options,options,args|
node = get_node_from_args(args)
- exec "ssh -l root -o 'HostName=#{node.ip_address}' -o 'HostKeyAlias=#{node.name}' -o 'UserKnownHostsFile=#{path(:known_hosts)}' -o 'StrictHostKeyChecking=yes' -p #{node.ssh.port} #{node.name}"
+ exec "ssh -l root -o 'HostName=#{node.ip_address}' -o 'HostKeyAlias=#{node.name}' -o 'GlobalKnownHostsFile=#{path(:known_hosts)}' -o 'StrictHostKeyChecking=yes' -p #{node.ssh.port} #{node.name}"
end
end
diff --git a/lib/leap_cli/commands/util.rb b/lib/leap_cli/commands/util.rb
index d9e6923..164ce0d 100644
--- a/lib/leap_cli/commands/util.rb
+++ b/lib/leap_cli/commands/util.rb
@@ -93,7 +93,7 @@ module LeapCli; module Commands
def ssh_options
{
:config => false,
- :user_known_hosts_file => path(:known_hosts),
+ :global_known_hosts_file => path(:known_hosts),
:paranoid => true
}
end
diff --git a/vendor/supply_drop/lib/supply_drop/rsync.rb b/vendor/supply_drop/lib/supply_drop/rsync.rb
index 7356653..3030038 100644
--- a/vendor/supply_drop/lib/supply_drop/rsync.rb
+++ b/vendor/supply_drop/lib/supply_drop/rsync.rb
@@ -32,6 +32,7 @@ module SupplyDrop
when :config then "-F #{value}"
when :port then "-p #{value}"
when :user_known_hosts_file then "-o 'UserKnownHostsFile=#{value}'"
+ when :global_known_hosts_file then "-o 'GlobalKnownHostsFile=#{value}'"
when :host_key_alias then "-o 'HostKeyAlias=#{value}'"
when :paranoid then "-o 'StrictHostKeyChecking=yes'"
when :host_name then "-o 'HostName=#{value}'"