diff --git a/manifests/main/dirs.pp b/manifests/main/dirs.pp index cab2764..daa1a82 100644 --- a/manifests/main/dirs.pp +++ b/manifests/main/dirs.pp @@ -71,7 +71,7 @@ class cd_nagios::main::dirs ( if $::fqdn == $ng_nagios_server { - # /etc/nagios/conf.d + # /etc/nagios/conf.d file { $ng_conf_d_dir: ensure => directory, @@ -182,5 +182,19 @@ class cd_nagios::main::dirs ( seltype => usr_t, seluser => system_u, } + + # run dir for pid file + file { $ng_run_dir: + ensure => directory, + path => $ng_run_dir, + owner => 'nagios', + group => 'nagios', + mode => '0750', + selrange => s0, + selrole => object_r, + seltype => nagios_var_run_t, + seluser => system_u, + } + } } diff --git a/manifests/params.pp b/manifests/params.pp index bd78854..fe9dfcd 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -938,6 +938,7 @@ $ng_log_archives = "${ng_log_dir}/archives" $ng_spool_dir = '/var/spool/nagios' $ng_usr_share = '/usr/share/nagios' $ng_share_html = "${ng_usr_share}/html" +$ng_run_dir = '/var/run/nagios' # files $ng_main_config = "${ng_main_dir}/nagios.cfg" diff --git a/manifests/server/files.pp b/manifests/server/files.pp index 2d56004..42bdc6a 100644 --- a/manifests/server/files.pp +++ b/manifests/server/files.pp @@ -27,9 +27,7 @@ class cd_nagios::server::files ( if $::fqdn == $ng_nagios_server { if $ng_use_https == true { if $ng_enable_certbot == true { - require cd_nagios::certbot::certs - } }