diff options
author | varac <varacanero@zeromail.org> | 2016-03-10 20:23:29 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2016-03-10 20:23:29 +0100 |
commit | dd7443163c1471b847549de1d6d2ee7606079ee7 (patch) | |
tree | 52b8ec2c5faa4c63e4cec11052e0bcdb3c190fed /manifests/base.pp | |
parent | 4081c66952614743b60b5031791cb43d23d48fa1 (diff) | |
parent | f062559072e7d4281c114d799208a3d093a74a47 (diff) |
Merge remote-tracking branch 'shared/master' into leap_master
Diffstat (limited to 'manifests/base.pp')
-rw-r--r-- | manifests/base.pp | 64 |
1 files changed, 40 insertions, 24 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 1ba0679..18d5c12 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -69,9 +69,9 @@ class nagios::base { if $cfg_dir == '/etc/nagios3' { file{'/etc/nagios': - ensure => link, - target => $cfg_dir, - require => Package['nagios'], + ensure => link, + target => $cfg_dir, + before => File['nagios_cfgdir'], } } @@ -94,34 +94,50 @@ class nagios::base { ensure => file, replace => false, notify => Service['nagios'], + require => File['nagios_cfgdir'], owner => root, group => 0, mode => '0644'; } - if $nagios::purge_resources { - resources { - [ - 'nagios_command', - 'nagios_contactgroup', - 'nagios_contact', - 'nagios_hostdependency', - 'nagios_hostescalation', - 'nagios_hostextinfo', - 'nagios_hostgroup', - 'nagios_host', - 'nagios_servicedependency', - 'nagios_serviceescalation', - 'nagios_servicegroup', - 'nagios_serviceextinfo', - 'nagios_service', - 'nagios_timeperiod', - ]: - notify => Service['nagios'], - purge => true; - } + resources { + [ + 'nagios_command', + 'nagios_contactgroup', + 'nagios_contact', + 'nagios_hostdependency', + 'nagios_hostescalation', + 'nagios_hostextinfo', + 'nagios_hostgroup', + 'nagios_host', + 'nagios_servicedependency', + 'nagios_serviceescalation', + 'nagios_servicegroup', + 'nagios_serviceextinfo', + 'nagios_service', + 'nagios_timeperiod', + ]: + notify => Service['nagios'], + purge => $::nagios::purge_resources } + # make sure nagios resources are defined after nagios is + # installed and the nagios_cfgdir resource is present + File['nagios_cfgdir'] -> Nagios_command <||> + File['nagios_cfgdir'] -> Nagios_contactgroup <||> + File['nagios_cfgdir'] -> Nagios_contact <||> + File['nagios_cfgdir'] -> Nagios_hostdependency <||> + File['nagios_cfgdir'] -> Nagios_hostescalation <||> + File['nagios_cfgdir'] -> Nagios_hostextinfo <||> + File['nagios_cfgdir'] -> Nagios_hostgroup <||> + File['nagios_cfgdir'] -> Nagios_host <||> + File['nagios_cfgdir'] -> Nagios_servicedependency <||> + File['nagios_cfgdir'] -> Nagios_serviceescalation <||> + File['nagios_cfgdir'] -> Nagios_servicegroup <||> + File['nagios_cfgdir'] -> Nagios_serviceextinfo <||> + File['nagios_cfgdir'] -> Nagios_service <||> + File['nagios_cfgdir'] -> Nagios_timeperiod <||> + if ( $nagios::storeconfigs == true ) { include ::nagios::storeconfigs } |