Recommit for updates in build 11

This commit is contained in:
Jenkins Server
2026-02-13 16:46:41 +01:00
parent 1e698109d7
commit acda44046f
4 changed files with 11 additions and 29 deletions

View File

@@ -121,7 +121,7 @@
</li><li>
<p>manage dynamic NRPE check command definitions</p>
</li><li>
<p>manage iptables (optional). set <code>ne_incl_fw</code>to <code>true</code>. Specify a custom value to <code>ne_nagios_source</code> for the nagior server IP or range.</p>
<p>manage iptables (optional). set <code>ne_incl_fw</code>to <code>true</code>.</p>
</li><li>
<p>manage selinux rule exceptions (optional)</p>
</li><li>
@@ -129,7 +129,7 @@
</li></ul>
<blockquote>
<p>Note: The value for the <code>nagios_server</code> variable is derived from a global paraneter set in Foreman (<code>nagios_server</code>), because the paremeter is used across multiple modules. You need to set that manually in Foreman under “Global Parameters”.</p>
<p>Note: The value for the <code>nagios_server</code> variable is derived from a global paraneter set in Foreman (<code>nagios_server</code>), because the paremeter is used across multiple modules. You need to set that manually in Foreman under “Global Parameters”. Same for <code>nagios_source</code>, the value for the firewall source.</p>
</blockquote>
<h2 id="label-Repo+Documentation">Repo Documentation</h2>

View File

@@ -121,7 +121,7 @@
</li><li>
<p>manage dynamic NRPE check command definitions</p>
</li><li>
<p>manage iptables (optional). set <code>ne_incl_fw</code>to <code>true</code>. Specify a custom value to <code>ne_nagios_source</code> for the nagior server IP or range.</p>
<p>manage iptables (optional). set <code>ne_incl_fw</code>to <code>true</code>.</p>
</li><li>
<p>manage selinux rule exceptions (optional)</p>
</li><li>
@@ -129,7 +129,7 @@
</li></ul>
<blockquote>
<p>Note: The value for the <code>nagios_server</code> variable is derived from a global paraneter set in Foreman (<code>nagios_server</code>), because the paremeter is used across multiple modules. You need to set that manually in Foreman under “Global Parameters”.</p>
<p>Note: The value for the <code>nagios_server</code> variable is derived from a global paraneter set in Foreman (<code>nagios_server</code>), because the paremeter is used across multiple modules. You need to set that manually in Foreman under “Global Parameters”. Same for <code>nagios_source</code>, the value for the firewall source.</p>
</blockquote>
<h2 id="label-Repo+Documentation">Repo Documentation</h2>

View File

@@ -120,7 +120,7 @@ class confdroid_nrpe::firewall::iptables (
) inherits confdroid_nrpe::params {
if $ne_incl_fw == true {
firewall { &quot;${ne_fw_order_no}${ne_nrpe_port} port ${ne_nrpe_port}&quot;:
source =&gt; $ne_nagios_source,
source =&gt; $nagios_source,
proto =&gt; &#39;tcp&#39;,
dport =&gt; $ne_nrpe_port,
jump =&gt; &#39;accept&#39;,

View File

@@ -741,24 +741,6 @@ inherited by all classes except defines.
&mdash;
<div class='inline'>
<p>Whether to manage command rules for NRPE checks, to allow dynamic check &amp; command rules.</p>
</div>
</li>
<li>
<span class='name'>ne_nagios_source</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;0.0.0.0/0&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the source address for the firewall rule. Adjust to your environment if needed. Default is 0.0.0.0/0 to allow all sources, but it is recommended to specify the nagios server IP or subnet.</p>
</div>
</li>
@@ -781,6 +763,9 @@ inherited by all classes except defines.
<pre class="lines">
78
79
80
81
82
83
@@ -865,13 +850,10 @@ inherited by all classes except defines.
162
163
164
165
166
167
168</pre>
165</pre>
</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 (
@@ -918,7 +900,6 @@ class confdroid_nrpe::params (
# firewall
Boolean $ne_incl_fw = true,
String $ne_fw_order_no = &#39;50&#39;,
String $ne_nagios_source = &#39;0.0.0.0/0&#39;,
# selinux
Boolean $ne_include_selinux = true,
@@ -930,6 +911,7 @@ class confdroid_nrpe::params (
$os_name = $facts[&#39;os&#39;][&#39;name&#39;]
$os_release = $facts[&#39;os&#39;][&#39;release&#39;][&#39;major&#39;]
$nagios_server = $facts[&#39;nagios_server&#39;]
$nagios_source = $facts[&#39;nagios_source&#39;]
# service
$ne_service = &#39;nrpe&#39;