Recommit for updates in build 113

This commit is contained in:
Jenkins Server
2026-03-01 18:54:29 +01:00
parent 80dfe1c8f3
commit 7ab909e442
2 changed files with 118 additions and 98 deletions

View File

@@ -226,9 +226,10 @@
class confdroid_nagios::client::target ( class confdroid_nagios::client::target (
) inherits confdroid_nagios::params { ) inherits confdroid_nagios::params {
if $ng_nagios_server == $fqdn { if ($ng_nagios_server == $fqdn) and ($ng_enable_target == true) {
if $ng_include_nrpe == true { if $ng_include_nrpe == true {
require confdroid_nrpe require confdroid_nrpe
}
@@nagios_host { $fqdn: @@nagios_host { $fqdn:
ensure => $ng_ping_ensure, ensure => $ng_ping_ensure,
@@ -339,7 +340,6 @@ class confdroid_nagios::client::target (
mode => '0640', mode => '0640',
} }
} }
}
}</pre> }</pre>
</td> </td>
</tr> </tr>

View File

@@ -955,6 +955,24 @@ inherited by all classes except defines.
</li> </li>
<li>
<span class='name'>ng_enable_target</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>true</tt>)</em>
&mdash;
<div class='inline'>
<p>Whether to enable the generation of host and service configuration files for the Nagios server. Default is true.</p>
</div>
</li>
<li> <li>
<span class='name'>ng_contactgroup_members</span> <span class='name'>ng_contactgroup_members</span>
@@ -979,8 +997,6 @@ inherited by all classes except defines.
<pre class="lines"> <pre class="lines">
103
104
105 105
106 106
107 107
@@ -1150,10 +1166,13 @@ inherited by all classes except defines.
271 271
272 272
273 273
274</pre> 274
275
276
277</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 103</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 105</span>
class confdroid_nagios::params ( class confdroid_nagios::params (
@@ -1169,6 +1188,7 @@ class confdroid_nagios::params (
String $ng_status_upd_interval = &#39;10&#39;, String $ng_status_upd_interval = &#39;10&#39;,
String $ng_check_ext_commands = &#39;1&#39;, String $ng_check_ext_commands = &#39;1&#39;,
String $ng_user = &#39;nagios&#39;, String $ng_user = &#39;nagios&#39;,
Boolean $ng_enable_target = true,
# contact groups # contact groups
String $ng_contactgroup_name = &#39;admins&#39;, String $ng_contactgroup_name = &#39;admins&#39;,