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/pnp4nagios.pp | |
parent | 4081c66952614743b60b5031791cb43d23d48fa1 (diff) | |
parent | f062559072e7d4281c114d799208a3d093a74a47 (diff) |
Merge remote-tracking branch 'shared/master' into leap_master
Diffstat (limited to 'manifests/pnp4nagios.pp')
-rw-r--r-- | manifests/pnp4nagios.pp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index a7e1c73..32c9a33 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -18,6 +18,7 @@ class nagios::pnp4nagios { owner => root, group => root, notify => Service['nagios'], + require => Package['nagios']; } file { 'apache.conf': @@ -28,19 +29,20 @@ class nagios::pnp4nagios { owner => root, group => root, notify => Service['apache'], - require => Package['pnp4nagios'], + require => [ Package['apache2'], Package['pnp4nagios'] ], } # run npcd as daemon file { '/etc/default/npcd': - path => '/etc/default/npcd', - source => [ 'puppet:///modules/site_nagios/pnp4nagios/npcd', + path => '/etc/default/npcd', + source => [ 'puppet:///modules/site_nagios/pnp4nagios/npcd', 'puppet:///modules/nagios/pnp4nagios/npcd' ], - mode => '0644', - owner => root, - group => root, - notify => Service['npcd']; + mode => '0644', + owner => root, + group => root, + notify => Service['npcd'], + require => [ Package['nagios'], Package['pnp4nagios'] ]; } service { 'npcd': @@ -56,9 +58,10 @@ class nagios::pnp4nagios { path => '/usr/share/nagios3/htdocs/images/action.gif', source => [ 'puppet:///modules/site_nagios/pnp4nagios/action.gif', 'puppet:///modules/nagios/pnp4nagios/action.gif' ], - mode => '0644', - owner => root, - group => root, - notify => Service['nagios']; + mode => '0644', + owner => root, + group => root, + notify => Service['nagios'], + require => Package['nagios']; } } |