Merge branch 'jenkins-build-24' into 'master'

Auto-merge for build 24

See merge request puppet/confdroid_ssh!24

.puppet-lint.rc

@@ -0,0 +1,3 @@
+--no-variable_scope-check
+--no-top_scope_facts
+--no-140chars-check

doc/puppet_classes/confdroid_ssh_3A_3Aparams.html

@@ -1150,24 +1150,6 @@
         —
         <div class='inline'>
 <p>setting for sshd_config. Default is ‘none’, which means that no version addendum will be included in the SSH banner, but can be set to a custom string if you want to include additional information in the SSH version banner. This can be used for branding purposes, but should be used with caution as it can potentially leak information about the server that could be useful to attackers.</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>ssh_banner</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;none&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>setting for sshd_config. Default is ‘none’, which means that no banner will be displayed to users when they connect, but can be set to a valid file path if you want to display a custom banner message to users when they connect. This can be used to display legal notices, security warnings, or other information to users when they connect to the SSH server.</p>
 </div>
       
     </li>
@@ -1183,6 +1165,12 @@
         <pre class="lines">
 
 
+188
+189
+190
+191
+192
+193
 194
 195
 196
@@ -1262,17 +1250,10 @@
 270
 271
 272
-273
-274
-275
-276
-277
-278
-279
-280</pre>
+273</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 194</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 188</span>
 
 class confdroid_ssh::params (
 
@@ -1338,7 +1319,6 @@ class confdroid_ssh::params (
   String  $ssh_permit_tunnel                = &#39;no&#39;,
   String  $ssh_chroot_directory             = &#39;none&#39;,
   String  $ssh_version_addendum             = &#39;none&#39;,
-  String  $ssh_banner                       = &#39;none&#39;,
 
 ) {
 # default facts

manifests/params.pp

@@ -184,12 +184,6 @@
 #   additional information in the SSH version banner. This can be used for
 #   branding purposes, but should be used with caution as it can potentially
 #   leak information about the server that could be useful to attackers.
-# @param [String] ssh_banner setting for sshd_config.
-#   Default is 'none', which means that no banner will be displayed to users
-#   when they connect, but can be set to a valid file path if you want to
-#   display a custom banner message to users when they connect. This can be used
-#   to display legal notices, security warnings, or other information to users when
-#   they connect to the SSH server.
 ##############################################################################
 class confdroid_ssh::params (
 
@@ -255,7 +249,6 @@ class confdroid_ssh::params (
   String  $ssh_permit_tunnel                = 'no',
   String  $ssh_chroot_directory             = 'none',
   String  $ssh_version_addendum             = 'none',
-  String  $ssh_banner                       = 'none',
 
 ) {
 # default facts

templates/sshd_custom_conf.erb

@@ -67,6 +67,4 @@ PidFile <%= @ssh_pid_file %>
 MaxStartups <%= @ssh_max_startups %>
 PermitTunnel <%= @ssh_permit_tunnel %>
 ChrootDirectory <%= @ssh_chroot_directory %>
-VersionAddendum <%= @ssh_version_addendum %>
-
-Banner <%= @ssh_banner %>
+VersionAddendum <%= @ssh_version_addendum %>