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

diff --git a/modules/portforwarder/templates/authorized_keys.erb b/modules/portforwarder/templates/authorized_keys.erb
index ec11e54f6..f7b56fcd7 100644
--- a/modules/portforwarder/templates/authorized_keys.erb
+++ b/modules/portforwarder/templates/authorized_keys.erb
@@ -36,7 +36,7 @@ config.each_pair do |sourcehost, services|
 
 	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