diff options
| author | Micah <micah@riseup.net> | 2015-12-04 21:09:30 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2015-12-04 21:09:30 +0000 |
| commit | 0668ac5ca21a5dc5741a9ca962a1e38a39cffa76 (patch) | |
| tree | e2ef355a8f7b050b3fe647c66f7375b6999636b1 | |
| parent | f215de3de43f141ae71fd124a84003d157da7295 (diff) | |
| parent | 9f2abcf4e8904fb7424772a7d23cd7e87342bf28 (diff) | |
Merge branch 'pnp4nagios_jessie' into 'master'
[bug] Install pnp4nagios-web-config-nagios3 .deb
On jessie hosts, pnp4nagios-web defaults now to
pnp4nagios-web-config-icinga, so we install
pnp4nagios-web-config-nagios3 manually.
See merge request !16
| -rw-r--r-- | manifests/pnp4nagios.pp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 5ade74f..bdeb9b4 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -1,8 +1,9 @@ +# configure pnp4nagios class nagios::pnp4nagios { include nagios::defaults::pnp4nagios - package { 'pnp4nagios': - ensure => installed } + package { [ 'pnp4nagios', 'pnp4nagios-web-config-nagios3']: + ensure => installed } # unfortunatly we can't use the nagios_host and nagios_service @@ -21,8 +22,9 @@ class nagios::pnp4nagios { file { 'apache.conf': path => '/etc/pnp4nagios/apache.conf', - source => [ 'puppet:///modules/site_nagios/pnp4nagios/apache.conf', - 'puppet:///modules/nagios/pnp4nagios/apache.conf' ], + source => [ + 'puppet:///modules/site_nagios/pnp4nagios/apache.conf', + 'puppet:///modules/nagios/pnp4nagios/apache.conf' ], mode => '0644', owner => root, group => root, |