Recommit for updates in build 62
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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 => system_u,
|
||||
}
|
||||
|
||||
# /etc/nagios/conf.d
|
||||
file { $ng_conf_d_dir:
|
||||
ensure => directory,
|
||||
path => $ng_conf_d_dir,
|
||||
owner => 'root',
|
||||
group => 'nagios',
|
||||
mode => '0750',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => nagios_etc_t,
|
||||
seluser => system_u,
|
||||
}
|
||||
# /usr/lib64/nagios dir required for plugins
|
||||
# file { $ng_lib_dir:
|
||||
# ensure => directory,
|
||||
@@ -367,7 +390,7 @@ class confdroid_nagios::main::dirs (
|
||||
# seluser => system_u,
|
||||
# }
|
||||
|
||||
# if $fqdn == $ng_nagios_server {
|
||||
|
||||
# /etc/nagios/conf.d
|
||||
# file { $ng_conf_d_dir:
|
||||
# ensure => directory,
|
||||
@@ -484,7 +507,6 @@ class confdroid_nagios::main::dirs (
|
||||
# seltype => nagios_spool_t,
|
||||
# seluser => system_u,
|
||||
# }
|
||||
# }
|
||||
}
|
||||
}</pre>
|
||||
</td>
|
||||
|
||||
Reference in New Issue
Block a user