We use "keyinfo" in all kinda of places. Rename it to something more generic

[dsa-puppet.git] / modules / portforwarder / templates / authorized_keys.erb

diff --git a/modules/portforwarder/templates/authorized_keys.erb b/modules/portforwarder/templates/authorized_keys.erb
index c230bbc9c1c0c563f5d0fb78347c71ce687b91c0..d119bf2fe544ea3293d6c2e40d04b01b2400a8a8 100644 (file)
--- a/modules/portforwarder/templates/authorized_keys.erb
+++ b/modules/portforwarder/templates/authorized_keys.erb
@@ -1,3 +1,8 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
 <%=
 def getportforwarderkey(host)
        key = nil
@@ -24,7 +29,7 @@ config.each_pair do |sourcehost, services|
 
        if allowed_ports.length > 0
                sshkey = getportforwarderkey(sourcehost)
-               remote_ip = keyinfo[sourcehost][0]['ipHostNumber'].join(',')
+               remote_ip = ldapall[sourcehost]['ipHostNumber'].join(',')
                local_bind = '127.101.%d.%d'%[ (sourcehost.hash / 256 % 256), sourcehost.hash % 256 ]
 
                lines << "# from #{sourcehost}"