aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-07-05 00:05:09 -0700
committerelijah <elijah@riseup.net>2013-07-05 00:05:09 -0700
commit98839b3158b0f2cd7fab3ce277a531b13fe9fc75 (patch)
tree6145d60f80be791a8b5d7b0a099f0d39ca743aee
parent6e3a5a4e7523e5a1d31b35c95edb95f2ed58b536 (diff)
downloadleap_cli-98839b3158b0f2cd7fab3ce277a531b13fe9fc75.tar.gz
leap_cli-98839b3158b0f2cd7fab3ce277a531b13fe9fc75.tar.bz2
don't bind hosts in known_hosts to particular ports, since it causes all kinds of confusion. originally, i added this to prevent modification of ~/.ssh/known_hosts, but now we do this by just setting UserKnownHosts to /dev/null.
-rw-r--r--lib/leap_cli/commands/node.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/leap_cli/commands/node.rb b/lib/leap_cli/commands/node.rb
index 7bcfb23..b700a90 100644
--- a/lib/leap_cli/commands/node.rb
+++ b/lib/leap_cli/commands/node.rb
@@ -129,13 +129,7 @@ module LeapCli; module Commands
buffer << "#\n"
manager.nodes.keys.sort.each do |node_name|
node = manager.nodes[node_name]
- hostnames = [node.name, node.domain.internal, node.domain.full, node.ip_address].map {|hn|
- if node.ssh.port == 22
- hn
- else
- "[#{hn}]:#{node.ssh.port}"
- end
- }.join(',')
+ hostnames = [node.name, node.domain.internal, node.domain.full, node.ip_address].join(',')
pub_key = read_file([:node_ssh_pub_key,node.name])
if pub_key
buffer << [hostnames, pub_key].join(' ')