Recommit for updates in build 42
This commit is contained in:
@@ -196,7 +196,19 @@
|
||||
98
|
||||
99
|
||||
100
|
||||
101</pre>
|
||||
101
|
||||
102
|
||||
103
|
||||
104
|
||||
105
|
||||
106
|
||||
107
|
||||
108
|
||||
109
|
||||
110
|
||||
111
|
||||
112
|
||||
113</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
|
||||
@@ -294,6 +306,18 @@ class confdroid_nrpe::main::files (
|
||||
seluser => system_u,
|
||||
content => template($ne_ssl_privatekey_erb),
|
||||
}
|
||||
file { $ne_ssl_ca_cert_file:
|
||||
ensure => file,
|
||||
path => $ne_ssl_ca_cert_file,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => cert_t,
|
||||
seluser => system_u,
|
||||
content => template($ne_ssl_ca_cert_erb),
|
||||
}
|
||||
}
|
||||
}
|
||||
}</pre>
|
||||
|
||||
@@ -777,6 +777,24 @@ inherited by all classes except defines.
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>Optional parameter to specify the content of the nagios server ssl private key. This is used for the nagios server private key and has to be provided via Hiera or ENC. Must be specified if SSL is enabled.</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>ne_ssl_ca_cert_pem</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>Optional[String]</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>undef</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>Optional parameter to specify the content of the CA certificate. This is used for the CA certificate and has to be provided via Hiera or ENC. Must be specified if SSL is enabled.</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
@@ -799,9 +817,6 @@ inherited by all classes except defines.
|
||||
<pre class="lines">
|
||||
|
||||
|
||||
86
|
||||
87
|
||||
88
|
||||
89
|
||||
90
|
||||
91
|
||||
@@ -890,10 +905,16 @@ inherited by all classes except defines.
|
||||
174
|
||||
175
|
||||
176
|
||||
177</pre>
|
||||
177
|
||||
178
|
||||
179
|
||||
180
|
||||
181
|
||||
182
|
||||
183</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 86</span>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 89</span>
|
||||
|
||||
class confdroid_nrpe::params (
|
||||
|
||||
@@ -935,6 +956,7 @@ class confdroid_nrpe::params (
|
||||
String $ne_include_file = '',
|
||||
Optional[String] $ne_ssl_cert_pem = undef,
|
||||
Optional[String] $ne_ssl_privatekey_pem = undef,
|
||||
Optional[String] $ne_ssl_ca_cert_pem = undef,
|
||||
|
||||
# nrpe.conf
|
||||
String $ne_ssl_opts = '',
|
||||
@@ -983,6 +1005,8 @@ class confdroid_nrpe::params (
|
||||
$ne_ssl_cert_erb = 'confdroid_nrpe/ssl_cert.erb'
|
||||
$ne_ssl_privatekey_file = "/etc/pki/tls/private/${fqdn}.key.pem"
|
||||
$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_erb = 'confdroid_nrpe/ssl_ca_cert.erb'
|
||||
|
||||
# includes must be last
|
||||
include confdroid_nrpe::main::config
|
||||
|
||||
Reference in New Issue
Block a user