Recommit for updates in build 62

This commit is contained in:
Jenkins Server
2026-02-19 16:50:31 +01:00
parent e264b8ea59
commit 2113da203e
3 changed files with 31 additions and 5 deletions

View File

@@ -106,7 +106,9 @@
<ul><li>
<p>if FQDN equals the specified <code>ng_nagios_server</code>, nagios server with all required specs is installed, else only nagios client packages and the target specs</p>
</li><li>
<p>if <code>ng_include_nrpe</code>is set to <code>true</code>, the confdroid_nrpe module is automatically applied on clients (<a href="https://sourcecode.confdroid.com/confdroid/confdroid_nrpe">confdroid_nrpe</a> must be in the catalogue then )</p>
<p>an additional directory /etc/nagios/conf.d is created to place the custom checks etc. without being overwritten by updates.</p>
</li><li>
<p>if <code>ng_include_nrpe</code>is set to <code>true</code>, the confdroid_nrpe module is automatically applied on clients (<a href="https://sourcecode.confdroid.com/confdroid/confdroid_nrpe">confdroid_nrpe</a> must be in the catalogue then)</p>
</li></ul>
<h3 id="label-configuring+user+access">configuring user access</h3>

View File

@@ -106,7 +106,9 @@
<ul><li>
<p>if FQDN equals the specified <code>ng_nagios_server</code>, nagios server with all required specs is installed, else only nagios client packages and the target specs</p>
</li><li>
<p>if <code>ng_include_nrpe</code>is set to <code>true</code>, the confdroid_nrpe module is automatically applied on clients (<a href="https://sourcecode.confdroid.com/confdroid/confdroid_nrpe">confdroid_nrpe</a> must be in the catalogue then )</p>
<p>an additional directory /etc/nagios/conf.d is created to place the custom checks etc. without being overwritten by updates.</p>
</li><li>
<p>if <code>ng_include_nrpe</code>is set to <code>true</code>, the confdroid_nrpe module is automatically applied on clients (<a href="https://sourcecode.confdroid.com/confdroid/confdroid_nrpe">confdroid_nrpe</a> must be in the catalogue then)</p>
</li></ul>
<h3 id="label-configuring+user+access">configuring user access</h3>

View File

@@ -291,7 +291,18 @@
193
194
195
196</pre>
196
197
198
199
200
201
202
203
204
205
206
207</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span>
@@ -341,6 +352,18 @@ class confdroid_nagios::main::dirs (
seluser =&gt; system_u,
}
# /etc/nagios/conf.d
file { $ng_conf_d_dir:
ensure =&gt; directory,
path =&gt; $ng_conf_d_dir,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;nagios&#39;,
mode =&gt; &#39;0750&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; nagios_etc_t,
seluser =&gt; system_u,
}
# /usr/lib64/nagios dir required for plugins
# file { $ng_lib_dir:
# ensure =&gt; directory,
@@ -367,7 +390,7 @@ class confdroid_nagios::main::dirs (
# seluser =&gt; system_u,
# }
# if $fqdn == $ng_nagios_server {
# /etc/nagios/conf.d
# file { $ng_conf_d_dir:
# ensure =&gt; directory,
@@ -484,7 +507,6 @@ class confdroid_nagios::main::dirs (
# seltype =&gt; nagios_spool_t,
# seluser =&gt; system_u,
# }
# }
}
}</pre>
</td>