From: Tollef Fog Heen <tfheen@err.no>
Date: Sat, 13 Apr 2019 20:33:33 +0000 (+0200)
Subject: Enable banner setting
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=15ed8866b7269bdb0e52285af2d0c6cf5b4e8ac8;p=mirror%2Fdsa-puppet.git

Enable banner setting
---

diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb
index d7e197cfa..d3dff0488 100644
--- a/modules/ssh/templates/sshd_config.erb
+++ b/modules/ssh/templates/sshd_config.erb
@@ -52,10 +52,10 @@ PasswordAuthentication no
 <%=
   allnodeinfo = scope.lookupvar('site::allnodeinfo')
   out = ''
-  settings = '#  Banner "You are coming from a debian.org host."'
+  settings = '  Banner "You are coming from a debian.org host."'
   allnodeinfo.keys.sort.each do |node|
       next unless allnodeinfo[node].has_key?('ipHostNumber')
-      out += "# Match Address "
+      out += "Match Address "
       out += allnodeinfo[node]['ipHostNumber'].collect do |ipnum|
           if ipnum =~ /:/
               "#{ipnum}/128"
@@ -63,7 +63,7 @@ PasswordAuthentication no
               "#{ipnum}/32"
           end
       end.join(',')
-      out += "# #{node}"
+      out += " # #{node}"
       out += "\n"
       out += settings
       out += "\n\n"