Recommit for updates in build 51

doc/puppet_classes/confdroid_nrpe_3A_3Amain_3A_3Adirs.html

@@ -131,7 +131,21 @@
 33
 34
 35
-36</pre>
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span>
@@ -166,6 +180,20 @@ class confdroid_nrpe::main::dirs (
     seltype  =&gt; var_run_t,
     seluser  =&gt; system_u,
   }
+
+  if $ne_enable_ssl {
+    file { $ne_servercert_dir:
+      ensure   =&gt; directory,
+      path     =&gt; $ne_servercert_dir,
+      owner    =&gt; &#39;root&#39;,
+      group    =&gt; &#39;root&#39;,
+      mode     =&gt; &#39;0755&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; cert_t,
+      seluser  =&gt; system_u,
+    }
+  }
 }</pre>
       </td>
     </tr>

doc/puppet_classes/confdroid_nrpe_3A_3Aparams.html

@@ -367,24 +367,6 @@ inherited by all classes except defines.
       
     </li>
   
-    <li>
-      
-        <span class='name'>ne_ssl_use_adh</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>This is for backward compatibility and is DEPRECATED. Set to 1 to enable ADH or 2 to require ADH. 1 is currently the default but will be changed in a later version.</p>
-</div>
-      
-    </li>
-  
     <li>
       
         <span class='name'>ne_ssl_cipher_list</span>
@@ -411,7 +393,7 @@ inherited by all classes except defines.
         <span class='type'>(<tt>String</tt>)</span>
       
       
-        <em class="default">(defaults to: <tt>&#39;2&#39;</tt>)</em>
+        <em class="default">(defaults to: <tt>&#39;0&#39;</tt>)</em>
       
       
         &mdash;
@@ -799,6 +781,9 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
+84
+85
+86
 87
 88
 89
@@ -889,13 +874,10 @@ inherited by all classes except defines.
 174
 175
 176
-177
+177</pre>
-178
-179
-180</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 87</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 84</span>
 
 class confdroid_nrpe::params (
 
@@ -928,9 +910,8 @@ class confdroid_nrpe::params (
   String $ne_allow_weak_rnd_seed          = &#39;1&#39;,
   Boolean $ne_enable_ssl                  = false,
   String $ne_ssl_version                  = &#39;TLSv2+&#39;,
-  String $ne_ssl_use_adh                  = &#39;1&#39;,
   String $ne_ssl_cipher_list              = &#39;ALL:!aNULL:!eNULL:!SSLv2:!LOW:!EXP:!RC4:!MD5:@STRENGTH&#39;,
-  String $ne_ssl_client_certs             = &#39;2&#39;,
+  String $ne_ssl_client_certs             = &#39;0&#39;,
   String $ne_ssl_logging                  = &#39;0x00&#39;,
   Array $ne_nasty_metachars               = [&quot;|`&amp;&gt;&lt;&#39;\\[]{};\r\n&quot;],
   String $ne_include_file                 = &#39;&#39;,
@@ -963,6 +944,7 @@ class confdroid_nrpe::params (
 # directories
   $ne_main_conf_d_dir         = &#39;/etc/nrpe.d&#39;
   $ne_run_dir                 = &#39;/var/run/nrpe&#39;
+  $ne_servercert_dir           = &#39;/etc/pki/tls/servercerts&#39;
 
 # files
   $ne_main_conf_file          = &#39;/etc/nagios/nrpe.cfg&#39;
@@ -981,11 +963,11 @@ class confdroid_nrpe::params (
   $ne_checkmodule_nrpe_erb    = &#39;confdroid_nrpe/checkmodule_nrpe.erb&#39;
   $ne_nrpe_pp_file            = &quot;${ne_main_conf_d_dir}/nrpe.pp&quot;
   $ne_semodule_erb            =  &#39;confdroid_nrpe/semodule_nrpe.erb&#39;
-  $ne_ssl_cert_file           = &#39;/etc/pki/tls/certs/nagios.crt.pem&#39;
+  $ne_ssl_cert_file           = &quot;${ne_servercert_dir}/nagios-crt.pem&quot;
   $ne_ssl_cert_erb            = &#39;confdroid_nrpe/ssl_cert.erb&#39;
-  $ne_ssl_privatekey_file     = &#39;/etc/pki/tls/private/nagios.key.pem&#39;
+  $ne_ssl_privatekey_file     = &quot;${ne_servercert_dir}/nagios-key.pem&quot;
   $ne_ssl_privatekey_erb      = &#39;confdroid_nrpe/ssl_privatekey.erb&#39;
-  $ne_ssl_ca_cert_file        = &#39;/etc/pki/tls/certs/ca-chain.crt.pem&#39;
+  $ne_ssl_ca_cert_file        = &quot;${ne_servercert_dir}/ca-cert.pem&quot;
   $ne_ssl_ca_cert_erb         = &#39;confdroid_nrpe/ssl_ca_cert.erb&#39;
 
 # includes must be last