X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fssh%2Ftemplates%2Fsshd_config.erb;h=32be972c6017ddb5c598d365bdb4f06cf0ca65d7;hb=ab150b859b5aec77d90197875b1a69aa9f49cd33;hp=8463fe60062b88a28b452d59f3c96fdde1bde7fd;hpb=231f3f2e471d7ecfc272d428a2116c90e3b176e8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb
index 8463fe600..32be972c6 100644
--- a/modules/ssh/templates/sshd_config.erb
+++ b/modules/ssh/templates/sshd_config.erb
@@ -49,16 +49,25 @@ AuthorizedKeysFile /etc/ssh/userkeys/%u /var/lib/misc/userkeys/%u /etc/ssh/userk
 
 PasswordAuthentication no
 
-Match Address <%=
+<%=
   allnodeinfo = scope.lookupvar('site::allnodeinfo')
-  dbs = []
+  out = ''
+  settings = '#  Banner "You are coming from a debian.org host."'
   allnodeinfo.keys.sort.each do |node|
       next unless allnodeinfo[node].has_key?('ipHostNumber')
-      dbs << allnodeinfo[node]['ipHostNumber']
+      out += "# Match Address # #{node}"
+      out += allnodeinfo[node]['ipHostNumber'].collect do |ipnum|
+          if ipnum =~ /:/
+              "#{ipnum}/128"
+          else
+              "#{ipnum}/32"
+          end
+      end.join(',')
+      out += "\n"
+      out += settings
   end
-  dbs.flatten.join(',')
+  out
 %>
-  Banner "You're coming from a debian.org host"
 
 Match Group sftponly
   AllowStreamLocalForwarding no