X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Ftemplates%2Fsshd_config.erb;h=870f16fa68f99c58c2a7b19a7f0026ebb23fd3fe;hb=d0c098685b92334a611a0c596a35f538b95ead47;hp=e51a8f63b9e00d8ff56db8e783b1a47ef4e586d6;hpb=33d6523dae7e23cd732374d416f62b2a9e2eb2d9;p=mirror%2Fdsa-puppet.git diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb index e51a8f63b..870f16fa6 100644 --- a/modules/ssh/templates/sshd_config.erb +++ b/modules/ssh/templates/sshd_config.erb @@ -45,24 +45,31 @@ Subsystem sftp /usr/lib/openssh/sftp-server UsePAM yes -AuthorizedKeysFile /etc/ssh/userkeys/%u /var/lib/misc/userkeys/%u /etc/ssh/userkeys/%u.more +AuthorizedKeysFile /etc/ssh/userkeys/%u /var/lib/misc/userkeys/%u /etc/ssh/userkeys/%u.more /etc/ssh/puppetkeys/%u PasswordAuthentication no -Match Address <%= - allnodeinfo = scope.lookupvar('site::allnodeinfo') - dbs = [] +<%= + allnodeinfo = scope.lookupvar('deprecated::allnodeinfo') + out = '' + settings = '# Banner "You are coming from a debian.org host."' allnodeinfo.keys.sort.each do |node| next unless allnodeinfo[node].has_key?('ipHostNumber') - if allnodeinfo[node]['ipHostNumber'] =~ ":" - dbs << "#{allnodeinfo[node]['ipHostNumber']}/128" - else - dbs << "#{allnodeinfo[node]['ipHostNumber']}/32" - end + out += "# Match Address " + out += allnodeinfo[node]['ipHostNumber'].collect do |ipnum| + if ipnum =~ /:/ + "#{ipnum}/128" + else + "#{ipnum}/32" + end + end.join(',') + out += " # #{node}" + out += "\n" + out += settings + out += "\n\n" end - dbs.flatten.join(',') + out %> - Banner "You're coming from a debian.org host" Match Group sftponly AllowStreamLocalForwarding no