From: elijah <elijah@riseup.net>
Date: Fri, 2 Nov 2012 04:46:54 +0000 (-0700)
Subject: fixed generation of authorized_keys and known_hosts: now entries are sorted
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=31c8c23bbb7e575be7c2231833dfec880c3d9d16;p=leap%2Fleap_cli.git

fixed generation of authorized_keys and known_hosts: now entries are sorted
---

diff --git a/lib/leap_cli/commands/node.rb b/lib/leap_cli/commands/node.rb
index e200a19..d05e233 100644
--- a/lib/leap_cli/commands/node.rb
+++ b/lib/leap_cli/commands/node.rb
@@ -55,7 +55,8 @@ module LeapCli; module Commands
   #
   def update_known_hosts
     buffer = StringIO.new
-    manager.nodes.values.each do |node|
+    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].join(',')
       pub_key = read_file([:node_ssh_pub_key,node.name])
       if pub_key
diff --git a/lib/leap_cli/commands/user.rb b/lib/leap_cli/commands/user.rb
index fbc366a..f0509ac 100644
--- a/lib/leap_cli/commands/user.rb
+++ b/lib/leap_cli/commands/user.rb
@@ -119,7 +119,7 @@ module LeapCli
 
     def update_authorized_keys
       buffer = StringIO.new
-      Dir.glob(path([:user_ssh, '*'])).each do |keyfile|
+      Dir.glob(path([:user_ssh, '*'])).sort.each do |keyfile|
         ssh_type, ssh_key = File.read(keyfile).strip.split(" ")
         buffer << ssh_type
         buffer << " "