Compare commits
1 Commits
master
...
cce454ae9d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cce454ae9d |
@@ -102,15 +102,13 @@ It is very recommendable to define such commands directly within Puppet modules
|
||||
|
||||
## managing TLS certificates
|
||||
|
||||
When `ne_enable_ssl` is enabled, the certificates for the ca (root if standalone or intermediate), the nagios server and the key for the nagios server have to be provided through the following values:
|
||||
When `ne_enable_ssl` is enabled (default), the certificates for the ca (root if standalone or intermediate), the nagios server and the key for the nagios server have to be provided through the following values:
|
||||
|
||||
- `ne_ssl_ca_cert_pem`
|
||||
- `ne_ssl_cert_pem`
|
||||
- `ne_ssl_privatekey_pem`
|
||||
|
||||
via Hiera (if you use it) or ENC. At the ENC need to add confdroid_nrpe::params and set those values.
|
||||
|
||||
If you don't need TLS encryption, leave `ne_enable_ssl` to the default value of `false`.
|
||||
via Hiera (if you use it) or ENC.
|
||||
|
||||
## SELINUX
|
||||
|
||||
|
||||
@@ -193,7 +193,7 @@
|
||||
|
||||
<h2 id="label-managing+TLS+certificates">managing TLS certificates</h2>
|
||||
|
||||
<p>When <code>ne_enable_ssl</code> is enabled, the certificates for the ca (root if standalone or intermediate), the nagios server and the key for the nagios server have to be provided through the following values:</p>
|
||||
<p>When <code>ne_enable_ssl</code> is enabled (default), the certificates for the ca (root if standalone or intermediate), the nagios server and the key for the nagios server have to be provided through the following values:</p>
|
||||
<ul><li>
|
||||
<p><code>ne_ssl_ca_cert_pem</code></p>
|
||||
</li><li>
|
||||
@@ -202,9 +202,7 @@
|
||||
<p><code>ne_ssl_privatekey_pem</code></p>
|
||||
</li></ul>
|
||||
|
||||
<p>via Hiera (if you use it) or ENC. At the ENC need to add confdroid_nrpe::params and set those values.</p>
|
||||
|
||||
<p>If you don’t need TLS encryption, leave <code>ne_enable_ssl</code> to the default value of <code>false</code>.</p>
|
||||
<p>via Hiera (if you use it) or ENC.</p>
|
||||
|
||||
<h2 id="label-SELINUX">SELINUX</h2>
|
||||
|
||||
|
||||
@@ -193,7 +193,7 @@
|
||||
|
||||
<h2 id="label-managing+TLS+certificates">managing TLS certificates</h2>
|
||||
|
||||
<p>When <code>ne_enable_ssl</code> is enabled, the certificates for the ca (root if standalone or intermediate), the nagios server and the key for the nagios server have to be provided through the following values:</p>
|
||||
<p>When <code>ne_enable_ssl</code> is enabled (default), the certificates for the ca (root if standalone or intermediate), the nagios server and the key for the nagios server have to be provided through the following values:</p>
|
||||
<ul><li>
|
||||
<p><code>ne_ssl_ca_cert_pem</code></p>
|
||||
</li><li>
|
||||
@@ -202,9 +202,7 @@
|
||||
<p><code>ne_ssl_privatekey_pem</code></p>
|
||||
</li></ul>
|
||||
|
||||
<p>via Hiera (if you use it) or ENC. At the ENC need to add confdroid_nrpe::params and set those values.</p>
|
||||
|
||||
<p>If you don’t need TLS encryption, leave <code>ne_enable_ssl</code> to the default value of <code>false</code>.</p>
|
||||
<p>via Hiera (if you use it) or ENC.</p>
|
||||
|
||||
<h2 id="label-SELINUX">SELINUX</h2>
|
||||
|
||||
|
||||
@@ -131,21 +131,7 @@
|
||||
33
|
||||
34
|
||||
35
|
||||
36
|
||||
37
|
||||
38
|
||||
39
|
||||
40
|
||||
41
|
||||
42
|
||||
43
|
||||
44
|
||||
45
|
||||
46
|
||||
47
|
||||
48
|
||||
49
|
||||
50</pre>
|
||||
36</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span>
|
||||
@@ -180,20 +166,6 @@ 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,
|
||||
}
|
||||
}
|
||||
}</pre>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -206,7 +206,8 @@
|
||||
108
|
||||
109
|
||||
110
|
||||
111</pre>
|
||||
111
|
||||
112</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
|
||||
@@ -277,14 +278,15 @@ class confdroid_nrpe::main::files (
|
||||
notify => Exec['create_nrpe_pp'],
|
||||
}
|
||||
}
|
||||
|
||||
# file for ssl certificate
|
||||
if $ne_enable_ssl == true {
|
||||
file { $ne_ssl_cert_file:
|
||||
ensure => file,
|
||||
path => $ne_ssl_cert_file,
|
||||
owner => $ne_user,
|
||||
group => $ne_user,
|
||||
mode => '0440',
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => cert_t,
|
||||
@@ -294,9 +296,9 @@ class confdroid_nrpe::main::files (
|
||||
file { $ne_ssl_privatekey_file:
|
||||
ensure => file,
|
||||
path => $ne_ssl_privatekey_file,
|
||||
owner => $ne_user,
|
||||
group => $ne_user,
|
||||
mode => '0400',
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0600',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => cert_t,
|
||||
@@ -306,9 +308,9 @@ class confdroid_nrpe::main::files (
|
||||
file { $ne_ssl_ca_cert_file:
|
||||
ensure => file,
|
||||
path => $ne_ssl_ca_cert_file,
|
||||
owner => $ne_user,
|
||||
group => $ne_user,
|
||||
mode => '0440',
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => cert_t,
|
||||
|
||||
@@ -349,6 +349,42 @@ inherited by all classes except defines.
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>ne_ssl_version</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'TLSv2+'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>These directives allow you to specify how to use SSL/TLS.</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>ne_ssl_use_adh</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'1'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<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>
|
||||
@@ -367,6 +403,24 @@ inherited by all classes except defines.
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>ne_ssl_cacert_file</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'/etc/pki/tls/certs/ca-chain.crt.pem'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>path and name of the ssl certificate authority (ca) file / chain. must be full path.</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>ne_ssl_client_certs</span>
|
||||
@@ -375,7 +429,7 @@ inherited by all classes except defines.
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'0'</tt>)</em>
|
||||
<em class="default">(defaults to: <tt>'2'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
@@ -645,7 +699,7 @@ inherited by all classes except defines.
|
||||
<span class='type'>(<tt>Boolean</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>false</tt>)</em>
|
||||
<em class="default">(defaults to: <tt>true</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
@@ -763,13 +817,6 @@ inherited by all classes except defines.
|
||||
<pre class="lines">
|
||||
|
||||
|
||||
82
|
||||
83
|
||||
84
|
||||
85
|
||||
86
|
||||
87
|
||||
88
|
||||
89
|
||||
90
|
||||
91
|
||||
@@ -855,10 +902,19 @@ inherited by all classes except defines.
|
||||
171
|
||||
172
|
||||
173
|
||||
174</pre>
|
||||
174
|
||||
175
|
||||
176
|
||||
177
|
||||
178
|
||||
179
|
||||
180
|
||||
181
|
||||
182
|
||||
183</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 82</span>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 89</span>
|
||||
|
||||
class confdroid_nrpe::params (
|
||||
|
||||
@@ -889,9 +945,12 @@ class confdroid_nrpe::params (
|
||||
String $ne_command_timeout = '60',
|
||||
String $ne_connection_timeout = '300',
|
||||
String $ne_allow_weak_rnd_seed = '1',
|
||||
Boolean $ne_enable_ssl = false,
|
||||
Boolean $ne_enable_ssl = true,
|
||||
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 = '0',
|
||||
String $ne_ssl_cacert_file = '/etc/pki/tls/certs/ca-chain.crt.pem',
|
||||
String $ne_ssl_client_certs = '2',
|
||||
String $ne_ssl_logging = '0x00',
|
||||
Array $ne_nasty_metachars = ["|`&><'\\[]{};\r\n"],
|
||||
String $ne_include_file = '',
|
||||
@@ -924,7 +983,6 @@ 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'
|
||||
@@ -943,11 +1001,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 = "${ne_servercert_dir}/nagios-cert.pem"
|
||||
$ne_ssl_cert_file = '/etc/pki/tls/certs/nagios.crt.pem'
|
||||
$ne_ssl_cert_erb = 'confdroid_nrpe/ssl_cert.erb'
|
||||
$ne_ssl_privatekey_file = "${ne_servercert_dir}/nagios-key.pem"
|
||||
$ne_ssl_privatekey_file = '/etc/pki/tls/private/nagios.key.pem'
|
||||
$ne_ssl_privatekey_erb = 'confdroid_nrpe/ssl_privatekey.erb'
|
||||
$ne_ssl_ca_cert_file = "${ne_servercert_dir}/ca-cert.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'
|
||||
|
||||
# includes must be last
|
||||
|
||||
@@ -33,18 +33,4 @@ 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,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,14 +69,15 @@ class confdroid_nrpe::main::files (
|
||||
notify => Exec['create_nrpe_pp'],
|
||||
}
|
||||
}
|
||||
|
||||
# file for ssl certificate
|
||||
if $ne_enable_ssl == true {
|
||||
file { $ne_ssl_cert_file:
|
||||
ensure => file,
|
||||
path => $ne_ssl_cert_file,
|
||||
owner => $ne_user,
|
||||
group => $ne_user,
|
||||
mode => '0440',
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => cert_t,
|
||||
@@ -86,9 +87,9 @@ class confdroid_nrpe::main::files (
|
||||
file { $ne_ssl_privatekey_file:
|
||||
ensure => file,
|
||||
path => $ne_ssl_privatekey_file,
|
||||
owner => $ne_user,
|
||||
group => $ne_user,
|
||||
mode => '0400',
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0600',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => cert_t,
|
||||
@@ -98,9 +99,9 @@ class confdroid_nrpe::main::files (
|
||||
file { $ne_ssl_ca_cert_file:
|
||||
ensure => file,
|
||||
path => $ne_ssl_ca_cert_file,
|
||||
owner => $ne_user,
|
||||
group => $ne_user,
|
||||
mode => '0440',
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => cert_t,
|
||||
|
||||
@@ -30,9 +30,16 @@
|
||||
# daemon will allow plugins to finish executing before killing them off.
|
||||
# @param [String] ne_connection_timeout maximum number of seconds that the
|
||||
# NRPE daemon will wait for a connection to be established before exiting.
|
||||
# @param [String] ne_ssl_version These directives allow you to specify how to
|
||||
# use SSL/TLS.
|
||||
# @param [String] ne_ssl_use_adh 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.
|
||||
# @param [String] ne_ssl_cipher_list ciphers can be used. For backward
|
||||
# compatibility, this defaults to 'ssl_cipher_list=ALL:!MD5:@STRENGTH' in
|
||||
# this version but will be changed in a later version of NRPE.
|
||||
# @param [String] ne_ssl_cacert_file path and name of the ssl certificate
|
||||
# authority (ca) file / chain. must be full path.
|
||||
# @param [String] ne_ssl_client_certs determines client certificate usage.
|
||||
# Values: 0 = Don't ask for or require client certificates
|
||||
# 1 = Ask for client certificates
|
||||
@@ -108,9 +115,12 @@ class confdroid_nrpe::params (
|
||||
String $ne_command_timeout = '60',
|
||||
String $ne_connection_timeout = '300',
|
||||
String $ne_allow_weak_rnd_seed = '1',
|
||||
Boolean $ne_enable_ssl = false,
|
||||
Boolean $ne_enable_ssl = true,
|
||||
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 = '0',
|
||||
String $ne_ssl_cacert_file = '/etc/pki/tls/certs/ca-chain.crt.pem',
|
||||
String $ne_ssl_client_certs = '2',
|
||||
String $ne_ssl_logging = '0x00',
|
||||
Array $ne_nasty_metachars = ["|`&><'\\[]{};\r\n"],
|
||||
String $ne_include_file = '',
|
||||
@@ -143,7 +153,6 @@ 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'
|
||||
@@ -162,11 +171,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 = "${ne_servercert_dir}/nagios-cert.pem"
|
||||
$ne_ssl_cert_file = '/etc/pki/tls/certs/nagios.crt.pem'
|
||||
$ne_ssl_cert_erb = 'confdroid_nrpe/ssl_cert.erb'
|
||||
$ne_ssl_privatekey_file = "${ne_servercert_dir}/nagios-key.pem"
|
||||
$ne_ssl_privatekey_file = '/etc/pki/tls/private/nagios.key.pem'
|
||||
$ne_ssl_privatekey_erb = 'confdroid_nrpe/ssl_privatekey.erb'
|
||||
$ne_ssl_ca_cert_file = "${ne_servercert_dir}/ca-cert.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'
|
||||
|
||||
# includes must be last
|
||||
|
||||
@@ -33,9 +33,11 @@ connection_timeout=<%= @ne_connection_timeout %>
|
||||
|
||||
allow_weak_random_seed=<%= @ne_allow_weak_rnd_seed %>
|
||||
|
||||
<% if @ne_enable_ssl == true -%>
|
||||
<% if $ne_enable_ssl == true -%>
|
||||
ssl_version=<%= @ne_ssl_version %>
|
||||
ssl_use_adh=<%= @ne_ssl_use_adh %>
|
||||
ssl_cipher_list=<%= @ne_ssl_cipher_list %>
|
||||
ssl_cacert_file=<%= @ne_ssl_ca_cert_file %>
|
||||
ssl_cacert_file=<%= @ne_ssl_cacert_file %>
|
||||
ssl_cert_file=<%= @ne_ssl_cert_file %>
|
||||
ssl_privatekey_file=<%= @ne_ssl_privatekey_file %>
|
||||
ssl_client_certs=<%= @ne_ssl_client_certs %>
|
||||
|
||||
Reference in New Issue
Block a user