diff options
author | varac <varacanero@zeromail.org> | 2014-03-04 15:16:39 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2014-03-04 15:16:39 +0100 |
commit | 32217e18179687cd4adde350379c57c7f96ca59f (patch) | |
tree | 241fbd85ffb8b66f825ef2dc250fc479d6ec097f /puppet/modules/site_check_mk/manifests/server.pp | |
parent | e85bc5c99fc2d1d09a86aa7a5c8ad4038dd2de47 (diff) |
fix check_mk resource dependencies (Bug #5145)
Diffstat (limited to 'puppet/modules/site_check_mk/manifests/server.pp')
-rw-r--r-- | puppet/modules/site_check_mk/manifests/server.pp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/puppet/modules/site_check_mk/manifests/server.pp b/puppet/modules/site_check_mk/manifests/server.pp index 0c98cd5a..d1bc5930 100644 --- a/puppet/modules/site_check_mk/manifests/server.pp +++ b/puppet/modules/site_check_mk/manifests/server.pp @@ -25,25 +25,32 @@ class site_check_mk::server { require => Package['check-mk-server'] } - Exec['check_mk-reload'] -> Service['nagios'] + Exec['check_mk-reload'] -> + Exec['check_mk-refresh-inventory-daily'] -> + Service['nagios'] file { '/etc/check_mk/conf.d/use_ssh.mk': content => template('site_check_mk/use_ssh.mk'), - notify => Exec['check_mk-refresh']; + notify => Exec['check_mk-refresh'], + require => Package['check-mk-server']; '/etc/check_mk/all_hosts_static': content => $all_hosts, - notify => Exec['check_mk-refresh']; + notify => Exec['check_mk-refresh'], + require => Package['check-mk-server']; '/etc/check_mk/.ssh': - ensure => directory; + ensure => directory, + require => Package['check-mk-server']; '/etc/check_mk/.ssh/id_rsa': content => $seckey, owner => 'nagios', - mode => '0600'; + mode => '0600', + require => Package['check-mk-server']; '/etc/check_mk/.ssh/id_rsa.pub': content => "${type} ${pubkey} monitor", owner => 'nagios', - mode => '0644'; + mode => '0644', + require => Package['check-mk-server']; # check_icmp must be suid root or called by sudo # see https://leap.se/code/issues/5171 '/usr/lib/nagios/plugins/check_icmp': |