X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fportforwarder%2Ftemplates%2Fauthorized_keys.erb;h=ec11e54f67b6e5fec529f1e264ef0f1b16c20cc3;hb=bd35714fff1db0ae3901ea95e82a8f603130bcae;hp=c230bbc9c1c0c563f5d0fb78347c71ce687b91c0;hpb=5c53f7b228baff9ec2df4f9cef807f6e5137bb56;p=mirror%2Fdsa-puppet.git

diff --git a/modules/portforwarder/templates/authorized_keys.erb b/modules/portforwarder/templates/authorized_keys.erb
index c230bbc9c..ec11e54f6 100644
--- a/modules/portforwarder/templates/authorized_keys.erb
+++ b/modules/portforwarder/templates/authorized_keys.erb
@@ -1,4 +1,16 @@
+##
+## 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
+##
+
 <%=
+
+require 'digest/sha1'
+def get_local_ip_addr(host)
+	hash = Digest::SHA1.digest(host)
+	return '127.101.%d.%d'%[hash[0].ord, hash[1].ord]
+end
+
 def getportforwarderkey(host)
 	key = nil
 	begin
@@ -18,14 +30,14 @@ config.each_pair do |sourcehost, services|
 	##lines << "# sourcehost is #{sourcehost}"
 	services.each do |service|
 		##lines << "# targethost is #{service['target_host']}, my hostname #{hostname}, fqdn is #{fqdn}"
-		next if service['target_host'] != fqdn
+		next if service['target_host'] != @fqdn
 		allowed_ports << service['target_port'] if service['target_port']
 	end
 
 	if allowed_ports.length > 0
 		sshkey = getportforwarderkey(sourcehost)
-		remote_ip = keyinfo[sourcehost][0]['ipHostNumber'].join(',')
-		local_bind = '127.101.%d.%d'%[ (sourcehost.hash / 256 % 256), sourcehost.hash % 256 ]
+		remote_ip = scope.lookupvar('site::allnodeinfo')[sourcehost]['ipHostNumber'].join(',')
+		local_bind = get_local_ip_addr(sourcehost)
 
 		lines << "# from #{sourcehost}"
 		if sshkey.nil? or remote_ip.nil? or local_bind.nil?