Try to avoid reserved site keyword

[mirror/dsa-puppet.git] / modules / ssh / templates / sshd_config.erb

diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb
index 1649770..870f16f 100644 (file)
--- a/modules/ssh/templates/sshd_config.erb
+++ b/modules/ssh/templates/sshd_config.erb
@@ -45,26 +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')
-      allnodeinfo[node]['ipHostNumber'].each do |ipnum|
+      out += "# Match Address "
+      out += allnodeinfo[node]['ipHostNumber'].collect do |ipnum|
           if ipnum =~ /:/
-              dbs << "#{ipnum}/128"
+              "#{ipnum}/128"
           else
-              dbs << "#{ipnum}/32"
+              "#{ipnum}/32"
           end
-      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