treat it like the hash it is

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/manifests/site.pp b/manifests/site.pp
index 9a338083a5c6da799a9ada5ccb1ec85b56314a81..7f9e3119dc6c8d020c1f0cff6b6e8287683bf7e4 100644 (file)
--- 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 d0af2f21aefa654d936014d9e64ced9f0642bb5a..83dadf3c07b752bfd048a2a5431b9583bf7ae61b 100644 (file)
--- 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