diff --git a/README.md b/README.md index 7e33389..34fae23 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Nagios is a powerful open source software solution for monitoring your IT environments. -`confdroid_nagios` is a Puppet module allowing to fully automate the setup & configuration of the Nagios server, as well as actively adding client hosts and services to the monitoring environment through defines and `PuppetDB`. +`confdroid_nagios` is a Puppet module allowing to fully automate the setup & configuration of the Nagios server, as well as actively adding client hosts and services to the monitoring environment through defines and `PuppetDB`. ## WARNING @@ -32,7 +32,9 @@ Nagios is a powerful open source software solution for monitoring your IT enviro ## Features - if FQDN equals the specified `ng_nagios_server`, nagios server with all required specs is installed, else only nagios client packages and the target specs -- if `ng_include_nrpe`is set to `true`, the confdroid_nrpe module is automatically applied on clients ([confdroid_nrpe](https://sourcecode.confdroid.com/confdroid/confdroid_nrpe) must be in the catalogue then ) +- an additional directory /etc/nagios/conf.d is created to place the custom checks etc. without being overwritten by updates. +- if `ng_include_nrpe`is set to `true`, the confdroid_nrpe module is automatically applied on clients ([confdroid_nrpe](https://sourcecode.confdroid.com/confdroid/confdroid_nrpe) must be in the catalogue then) + ### configuring user access ToDo diff --git a/manifests/main/dirs.pp b/manifests/main/dirs.pp index 2401415..e624cc2 100644 --- a/manifests/main/dirs.pp +++ b/manifests/main/dirs.pp @@ -48,6 +48,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, @@ -74,7 +86,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, @@ -191,6 +203,5 @@ class confdroid_nagios::main::dirs ( # seltype => nagios_spool_t, # seluser => system_u, # } -# } } }