From 7674d9618f50acf645d96fe3a4122e180bc32d2a Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sat, 14 Nov 2009 19:31:15 +0000 Subject: [PATCH] treat it like the hash it is Signed-off-by: Stephen Gran --- manifests/site.pp | 1 + modules/ssh/templates/authorized_keys.erb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 9a338083a..7f9e3119d 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -17,6 +17,7 @@ node default { $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml") $hoster = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml") notice("hoster for ${fqdn} is ${hoster}") + $mxinfo = allnodinfo("mXRecord") include munin-node include sudo diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb index d0af2f21a..83dadf3c0 100644 --- a/modules/ssh/templates/authorized_keys.erb +++ b/modules/ssh/templates/authorized_keys.erb @@ -10,8 +10,8 @@ hosterkeys when "bartok.debian.org" then out = '' keyinfo.keys.sort.each do |node| - out += '# ' + node['hostname'].to_s + ' -command="/usr/lib/da-backup/da-backup-ssh-wrap ' + node['hostname'].to_s + '",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="' + node['ipHostNumber'].join(',') + '" ' + node['sshRSAHostKey'].to_s + ' + out += '# ' + keyinfo[node]['hostname'].to_s + ' +command="/usr/lib/da-backup/da-backup-ssh-wrap ' + keyinfo[node]['hostname'].to_s + '",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="' + keyinfo[node]['ipHostNumber'].join(',') + '" ' + keyinfo[node]['sshRSAHostKey'].to_s + ' ' end -- 2.20.1