X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fportforwarder%2Ftemplates%2Fauthorized_keys.erb;h=f7b56fcd7aa5db621e1fd410656118c253688d19;hb=dd1abc5423b5ee6aea94f94d15fdfeeb2b5596f9;hp=063312a2f6008e5131fb8a05cce91dd14c0d04f2;hpb=cf5ca6f6942ed9b46e05a0cdc8f43a54e5190044;p=mirror%2Fdsa-puppet.git

diff --git a/modules/portforwarder/templates/authorized_keys.erb b/modules/portforwarder/templates/authorized_keys.erb
index 063312a2f..f7b56fcd7 100644
--- a/modules/portforwarder/templates/authorized_keys.erb
+++ b/modules/portforwarder/templates/authorized_keys.erb
@@ -30,13 +30,13 @@ 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 = scope.lookupvar('site::allnodeinfo')[sourcehost]['ipHostNumber'].join(',')
+		remote_ip = scope.lookupvar('deprecated::allnodeinfo')[sourcehost]['ipHostNumber'].join(',')
 		local_bind = get_local_ip_addr(sourcehost)
 
 		lines << "# from #{sourcehost}"
@@ -44,7 +44,7 @@ config.each_pair do |sourcehost, services|
 			lines << "# insufficient config values"
 		else
 			command = "/usr/bin/portforwarder-ssh-wrap #{sourcehost} #{local_bind} #{allowed_ports.join(' ')}"
-			lines << "from=\"#{remote_ip}\",command=\"#{command}\",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding #{sshkey}"
+			lines << "from=\"#{remote_ip}\",command=\"#{command}\",restrict #{sshkey}"
 		end
 	end
 end