summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-03-21 11:06:18 +0100
committervarac <varacanero@zeromail.org>2016-03-21 11:06:18 +0100
commit68dab01a85996e14efcccf856b623a2caf257823 (patch)
treef8429daf28410d95422ff68c580e24fd53144de2
parent98a6ba0164ba55a619d0db7e6b50616f382ab454 (diff)
parenta510a5db9946a341c4485ef502eb9fef4fe42b2d (diff)
Merge remote-tracking branch 'shared/master' into leap_master
-rw-r--r--manifests/pnp4nagios.pp10
1 files changed, 2 insertions, 8 deletions
diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp
index bb695fb..bd7ab0c 100644
--- a/manifests/pnp4nagios.pp
+++ b/manifests/pnp4nagios.pp
@@ -2,17 +2,11 @@
class nagios::pnp4nagios {
include nagios::defaults::pnp4nagios
- package { 'pnp4nagios-web-config-nagios3':
- ensure => installed
- }
-
- package { 'pnp4nagios':
+ package { [ 'pnp4nagios', 'pnp4nagios-web-config-nagios3']:
ensure => installed,
- require => Package['pnp4nagios-web-config-nagios3'],
+ require => Package['nagios']
}
-
-
# unfortunatly we can't use the nagios_host and nagios_service
# definition to define templates, so we need to copy a file here.
# see http://projects.reductivelabs.com/issues/1180 for this limitation