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

Auto-merge for build 28

See merge request puppet/confdroid_ssh!28

doc/puppet_classes/confdroid_ssh_3A_3Amain_3A_3Afiles.html

@@ -166,7 +166,7 @@ class confdroid_ssh::main::files (
 
   if $ssh_manage_config {
     file { $sshd_custom_conf:
-      ensure   => $ssh_custom_ensure,
+      ensure   => file,
       path     => $sshd_custom_conf,
       owner    => $sshd_user,
       group    => $sshd_user,

doc/puppet_classes/confdroid_ssh_3A_3Aparams.html

@@ -1186,24 +1186,6 @@
         —
         <div class='inline'>
 <p>setting for sshd_config. Default is ‘2m’, which means that users have 2 minutes to successfully authenticate before the server disconnects them, but can be set to a different time interval if desired. This setting can be used to limit the amount of time that attackers have to attempt to brute-force authentication, but should be set to a reasonable value to avoid disconnecting legitimate users who may need more time to log</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>ssh_custom_ensure</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;file&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>whether the custom configuration file should be file or absent.</p>
 </div>
       
     </li>
@@ -1219,6 +1201,8 @@
         <pre class="lines">
 
 
+200
+201
 202
 203
 204
@@ -1304,13 +1288,10 @@
 284
 285
 286
-287
+287</pre>
-288
-289
-290</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 202</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 200</span>
 
 class confdroid_ssh::params (
 
@@ -1324,7 +1305,6 @@ class confdroid_ssh::params (
   String $ssh_source_range                  = &#39;0.0.0.0/0&#39;,
 
   # sshd configuration 
-  String  $ssh_custom_ensure                = &#39;file&#39;,
   Boolean $ssh_manage_config                = true,
   String  $ssh_address_family               = &#39;any&#39;,
   String  $ssh_listen_address               = &#39;0.0.0.0&#39;,

manifests/main/files.pp

@@ -23,7 +23,7 @@ class confdroid_ssh::main::files (
 
   if $ssh_manage_config {
     file { $sshd_custom_conf:
-      ensure   => $ssh_custom_ensure,
+      ensure   => file,
       path     => $sshd_custom_conf,
       owner    => $sshd_user,
       group    => $sshd_user,

manifests/params.pp

@@ -196,8 +196,6 @@
 #   time interval if desired. This setting can be used to limit the amount of time
 #   that attackers have to attempt to brute-force authentication, but should be set
 #   to a reasonable value to avoid disconnecting legitimate users who may need more time to log
-# @param [String] ssh_custom_ensure whether the custom configuration file 
-#   should be file or absent.
 ##############################################################################
 class confdroid_ssh::params (
 
@@ -211,7 +209,6 @@ class confdroid_ssh::params (
   String $ssh_source_range                  = '0.0.0.0/0',
 
   # sshd configuration 
-  String  $ssh_custom_ensure                = 'file',
   Boolean $ssh_manage_config                = true,
   String  $ssh_address_family               = 'any',
   String  $ssh_listen_address               = '0.0.0.0',