Recommit for updates in build 8

This commit is contained in:
Jenkins Server
2026-02-13 16:10:41 +01:00
parent cbdc8ebf70
commit b9a9c8bfcc
2 changed files with 7 additions and 25 deletions

View File

@@ -120,7 +120,7 @@ class confdroid_nrpe::firewall::iptables (
) inherits confdroid_nrpe::params { ) inherits confdroid_nrpe::params {
if $ne_incl_fw == true { if $ne_incl_fw == true {
firewall { "${ne_fw_order_no}${ne_nrpe_port} port ${ne_nrpe_port}": firewall { "${ne_fw_order_no}${ne_nrpe_port} port ${ne_nrpe_port}":
source => $ne_nagios_server, source => $nagios_server,
proto => 'tcp', proto => 'tcp',
dport => $ne_nrpe_port, dport => $ne_nrpe_port,
jump => 'accept', jump => 'accept',

View File

@@ -223,24 +223,6 @@ inherited by all classes except defines.
</li> </li>
<li>
<span class='name'>ne_nagios_server</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;nagios.example.net&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>ipaddress of the nagios server to be allowed to connect to NRPE service. Default is to look up a global parameter from ENC.</p>
</div>
</li>
<li> <li>
<span class='name'>ne_dont_blame_nrpe</span> <span class='name'>ne_dont_blame_nrpe</span>
@@ -781,6 +763,9 @@ inherited by all classes except defines.
<pre class="lines"> <pre class="lines">
78
79
80
81 81
82 82
83 83
@@ -864,13 +849,10 @@ inherited by all classes except defines.
161 161
162 162
163 163
164 164</pre>
165
166
167</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 81</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 78</span>
class confdroid_nrpe::params ( class confdroid_nrpe::params (
@@ -894,7 +876,6 @@ class confdroid_nrpe::params (
String $ne_nrpe_port = &#39;5666&#39;, String $ne_nrpe_port = &#39;5666&#39;,
String $ne_server_address = &#39;0.0.0.0&#39;, String $ne_server_address = &#39;0.0.0.0&#39;,
String $ne_listen_queue_size = &#39;5&#39;, String $ne_listen_queue_size = &#39;5&#39;,
String $ne_nagios_server = &#39;nagios.example.net&#39;,
String $ne_dont_blame_nrpe = &#39;1&#39;, String $ne_dont_blame_nrpe = &#39;1&#39;,
String $ne_allow_bash_cmd_subst = &#39;1&#39;, String $ne_allow_bash_cmd_subst = &#39;1&#39;,
Boolean $ne_allow_sudo = true, Boolean $ne_allow_sudo = true,
@@ -928,6 +909,7 @@ class confdroid_nrpe::params (
$domain = $facts[&#39;networking&#39;][&#39;domain&#39;] $domain = $facts[&#39;networking&#39;][&#39;domain&#39;]
$os_name = $facts[&#39;os&#39;][&#39;name&#39;] $os_name = $facts[&#39;os&#39;][&#39;name&#39;]
$os_release = $facts[&#39;os&#39;][&#39;release&#39;][&#39;major&#39;] $os_release = $facts[&#39;os&#39;][&#39;release&#39;][&#39;major&#39;]
$nagios_server = $facts[&#39;nagios_server&#39;]
# service # service
$ne_service = &#39;nrpe&#39; $ne_service = &#39;nrpe&#39;