projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mekeel now gets the UBC autofs config
[mirror/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
ec11e54
..
f7b56fc
100644
(file)
--- 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)
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}"
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 << "# 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
end
end
end