Compare commits

..

4 Commits

Author SHA1 Message Date
Jenkins Server
cce454ae9d Recommit for updates in build 46 2026-03-15 15:32:58 +01:00
Jenkins Server
438967b04f Merge remote-tracking branch 'origin/master' into jenkins-build-46 2026-03-15 15:31:57 +01:00
ddfb05f836 OP#501 adding variables and place holders for certs 2026-03-15 15:31:41 +01:00
Jenkins Server
353140d6a3 Merge remote-tracking branch 'origin/master' into jenkins-build-45 2026-03-15 15:24:47 +01:00
2 changed files with 6 additions and 6 deletions

View File

@@ -1001,11 +1001,11 @@ class confdroid_nrpe::params (
$ne_checkmodule_nrpe_erb = 'confdroid_nrpe/checkmodule_nrpe.erb' $ne_checkmodule_nrpe_erb = 'confdroid_nrpe/checkmodule_nrpe.erb'
$ne_nrpe_pp_file = "${ne_main_conf_d_dir}/nrpe.pp" $ne_nrpe_pp_file = "${ne_main_conf_d_dir}/nrpe.pp"
$ne_semodule_erb = 'confdroid_nrpe/semodule_nrpe.erb' $ne_semodule_erb = 'confdroid_nrpe/semodule_nrpe.erb'
$ne_ssl_cert_file = "/etc/pki/tls/certs/${fqdn}.crt.pem" $ne_ssl_cert_file = '/etc/pki/tls/certs/nagios.crt.pem'
$ne_ssl_cert_erb = 'confdroid_nrpe/ssl_cert.erb' $ne_ssl_cert_erb = 'confdroid_nrpe/ssl_cert.erb'
$ne_ssl_privatekey_file = "/etc/pki/tls/private/${fqdn}.key.pem" $ne_ssl_privatekey_file = '/etc/pki/tls/private/nagios.key.pem'
$ne_ssl_privatekey_erb = 'confdroid_nrpe/ssl_privatekey.erb' $ne_ssl_privatekey_erb = 'confdroid_nrpe/ssl_privatekey.erb'
$ne_ssl_ca_cert_file = "/etc/pki/tls/certs/${fqdn}-ca-chain.crt.pem" $ne_ssl_ca_cert_file = '/etc/pki/tls/certs/ca-chain.crt.pem'
$ne_ssl_ca_cert_erb = 'confdroid_nrpe/ssl_ca_cert.erb' $ne_ssl_ca_cert_erb = 'confdroid_nrpe/ssl_ca_cert.erb'
# includes must be last # includes must be last

View File

@@ -171,11 +171,11 @@ class confdroid_nrpe::params (
$ne_checkmodule_nrpe_erb = 'confdroid_nrpe/checkmodule_nrpe.erb' $ne_checkmodule_nrpe_erb = 'confdroid_nrpe/checkmodule_nrpe.erb'
$ne_nrpe_pp_file = "${ne_main_conf_d_dir}/nrpe.pp" $ne_nrpe_pp_file = "${ne_main_conf_d_dir}/nrpe.pp"
$ne_semodule_erb = 'confdroid_nrpe/semodule_nrpe.erb' $ne_semodule_erb = 'confdroid_nrpe/semodule_nrpe.erb'
$ne_ssl_cert_file = "/etc/pki/tls/certs/${fqdn}.crt.pem" $ne_ssl_cert_file = '/etc/pki/tls/certs/nagios.crt.pem'
$ne_ssl_cert_erb = 'confdroid_nrpe/ssl_cert.erb' $ne_ssl_cert_erb = 'confdroid_nrpe/ssl_cert.erb'
$ne_ssl_privatekey_file = "/etc/pki/tls/private/${fqdn}.key.pem" $ne_ssl_privatekey_file = '/etc/pki/tls/private/nagios.key.pem'
$ne_ssl_privatekey_erb = 'confdroid_nrpe/ssl_privatekey.erb' $ne_ssl_privatekey_erb = 'confdroid_nrpe/ssl_privatekey.erb'
$ne_ssl_ca_cert_file = "/etc/pki/tls/certs/${fqdn}-ca-chain.crt.pem" $ne_ssl_ca_cert_file = '/etc/pki/tls/certs/ca-chain.crt.pem'
$ne_ssl_ca_cert_erb = 'confdroid_nrpe/ssl_ca_cert.erb' $ne_ssl_ca_cert_erb = 'confdroid_nrpe/ssl_ca_cert.erb'
# includes must be last # includes must be last