From 0de9773a439eb820b1f118c0495cb4428a8a48eb Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 15 Mar 2026 16:30:53 +0100 Subject: [PATCH] Recommit for updates in build 51 --- .../confdroid_nrpe_3A_3Amain_3A_3Adirs.html | 30 +++++++++++++- .../confdroid_nrpe_3A_3Aparams.html | 40 +++++-------------- 2 files changed, 40 insertions(+), 30 deletions(-) diff --git a/doc/puppet_classes/confdroid_nrpe_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/confdroid_nrpe_3A_3Amain_3A_3Adirs.html index 2d29ec8..79aa6ad 100644 --- a/doc/puppet_classes/confdroid_nrpe_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/confdroid_nrpe_3A_3Amain_3A_3Adirs.html @@ -131,7 +131,21 @@ 33 34 35 -36 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 +50 
# File 'manifests/main/dirs.pp', line 6
@@ -166,6 +180,20 @@ class confdroid_nrpe::main::dirs (
     seltype  => var_run_t,
     seluser  => system_u,
   }
+
+  if $ne_enable_ssl {
+    file { $ne_servercert_dir:
+      ensure   => directory,
+      path     => $ne_servercert_dir,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0755',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => cert_t,
+      seluser  => system_u,
+    }
+  }
 }
diff --git a/doc/puppet_classes/confdroid_nrpe_3A_3Aparams.html b/doc/puppet_classes/confdroid_nrpe_3A_3Aparams.html index de4c1dd..a9732cc 100644 --- a/doc/puppet_classes/confdroid_nrpe_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_nrpe_3A_3Aparams.html @@ -367,24 +367,6 @@ inherited by all classes except defines. -
  • - - ne_ssl_use_adh - - - (String) - - - (defaults to: '1') - - - — -
    -

    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.

    -
    - -
    • -
  • ne_ssl_cipher_list @@ -411,7 +393,7 @@ inherited by all classes except defines. (String) - (defaults to: '2') + (defaults to: '0') — @@ -799,6 +781,9 @@ inherited by all classes except defines. 
     
 
+84
+85
+86
 87
 88
 89
@@ -889,13 +874,10 @@ inherited by all classes except defines.
 174
 175
 176
-177
-178
-179
-180
    +177 - 
    # File 'manifests/params.pp', line 87
+        
    # File 'manifests/params.pp', line 84
 
 class confdroid_nrpe::params (
 
@@ -928,9 +910,8 @@ class confdroid_nrpe::params (
   String $ne_allow_weak_rnd_seed          = '1',
   Boolean $ne_enable_ssl                  = false,
   String $ne_ssl_version                  = 'TLSv2+',
-  String $ne_ssl_use_adh                  = '1',
   String $ne_ssl_cipher_list              = 'ALL:!aNULL:!eNULL:!SSLv2:!LOW:!EXP:!RC4:!MD5:@STRENGTH',
-  String $ne_ssl_client_certs             = '2',
+  String $ne_ssl_client_certs             = '0',
   String $ne_ssl_logging                  = '0x00',
   Array $ne_nasty_metachars               = ["|`&><'\\[]{};\r\n"],
   String $ne_include_file                 = '',
@@ -963,6 +944,7 @@ class confdroid_nrpe::params (
 # directories
   $ne_main_conf_d_dir         = '/etc/nrpe.d'
   $ne_run_dir                 = '/var/run/nrpe'
+  $ne_servercert_dir           = '/etc/pki/tls/servercerts'
 
 # files
   $ne_main_conf_file          = '/etc/nagios/nrpe.cfg'
@@ -981,11 +963,11 @@ class confdroid_nrpe::params (
   $ne_checkmodule_nrpe_erb    = 'confdroid_nrpe/checkmodule_nrpe.erb'
   $ne_nrpe_pp_file            = "${ne_main_conf_d_dir}/nrpe.pp"
   $ne_semodule_erb            =  'confdroid_nrpe/semodule_nrpe.erb'
-  $ne_ssl_cert_file           = '/etc/pki/tls/certs/nagios.crt.pem'
+  $ne_ssl_cert_file           = "${ne_servercert_dir}/nagios-crt.pem"
   $ne_ssl_cert_erb            = 'confdroid_nrpe/ssl_cert.erb'
-  $ne_ssl_privatekey_file     = '/etc/pki/tls/private/nagios.key.pem'
+  $ne_ssl_privatekey_file     = "${ne_servercert_dir}/nagios-key.pem"
   $ne_ssl_privatekey_erb      = 'confdroid_nrpe/ssl_privatekey.erb'
-  $ne_ssl_ca_cert_file        = '/etc/pki/tls/certs/ca-chain.crt.pem'
+  $ne_ssl_ca_cert_file        = "${ne_servercert_dir}/ca-cert.pem"
   $ne_ssl_ca_cert_erb         = 'confdroid_nrpe/ssl_ca_cert.erb'
 
 # includes must be last