tvd-ssh 0.0.5 → 0.0.6

data/cookbooks/ssh/recipes/client.rb

@@ -1,25 +1,23 @@
-if node[:secrets][:ssh]
-  directory "#{ENV['HOME']}/.ssh" do
-    mode 0700
-  end
+directory "#{ENV['HOME']}/.ssh" do
+  mode 0700
+end
 
-  template "#{ENV['HOME']}/.ssh/config" do
-    source "client_config.erb"
-    mode 0600
-  end
+template "#{ENV['HOME']}/.ssh/config" do
+  source "client_config.erb"
+  mode 0600
+end
 
-  template "#{ENV['HOME']}/.ssh/authorized_keys" do
-    source "authorized_keys.erb"
-    mode 0600
-  end
+template "#{ENV['HOME']}/.ssh/authorized_keys" do
+  source "authorized_keys.erb"
+  mode 0600
+end
 
-  node[:secrets][:ssh][:known_hosts_files].sort.each do |kh_file, servers|
-    template "#{ENV['HOME']}/.ssh/#{kh_file}" do
-      source "known_hosts.erb"
-      variables(
-        :servers => servers.sort.inject([]) {|acc, server| acc << [server, node[:secrets][:ssh][:hosts][server]]; acc }
-      )
-      mode 0600
-    end
+node[:secrets][:ssh][:known_hosts_files].sort.each do |kh_file, servers|
+  template "#{ENV['HOME']}/.ssh/#{kh_file}" do
+    source "known_hosts.erb"
+    variables(
+      :servers => servers.sort.inject([]) {|acc, server| acc << [server, node[:secrets][:ssh][:hosts][server]]; acc }
+    )
+    mode 0600
   end
 end

data/cookbooks/ssh/templates/default/client_config.erb

@@ -1,6 +1,6 @@
 Host *
   User <%= node[:secrets][:username] %>
-  UserKnownHostsFile ~/.ssh/known_hosts # ~/.ssh/known_hosts2<% node[:secrets][:ssh][:known_hosts_files].keys.sort.each do |kh_file| %> ~/.ssh/<%= kh_file %><% end %>
+  UserKnownHostsFile ~/.ssh/known_hosts
   ServerAliveInterval 60
   ServerAliveCountMax 3
   ConnectTimeout 15
@@ -9,10 +9,11 @@ Host *
 <% node[:secrets][:ssh][:hosts].each do |name, config| %>
 Host <%= name %>
   User <%= config[:username] || node[:secrets][:username] %>
-  Hostname <%= config[:ssh_address] %>
   Port <%= config[:ssh_port] %>
   HostKeyAlias <%= config[:alias] || name %>
   ForwardAgent <%= config[:forward_agent] ? "yes" : "no" %>
   ForwardX11 <%= config[:forward_x11] ? "yes" : "no" %>
+  <% if config[:ssh_address] %>Hostname <%= config[:ssh_address] %><% end %>
+
 <% end %>
 

data/cookbooks/ssh/templates/default/known_hosts.erb

@@ -1,3 +1,3 @@
 <% @servers.each do |nm_server, server| %>
-<%= nm_server %>,[<%= server[:ssh_address] %>]:<%= server[:ssh_port] %> <%= server[:ssh_host_key] %>
+<%= nm_server %><% if server[:ssh_address] %>,[<%= server[:ssh_address] %>]:<%= server[:ssh_port] %><% end %> <%= server[:ssh_host_key] %>
 <% end %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tvd-ssh
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Tom Bombadil