diff options
| author | Micah <micah@riseup.net> | 2016-03-10 19:07:46 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2016-03-10 19:07:46 +0000 |
| commit | f062559072e7d4281c114d799208a3d093a74a47 (patch) | |
| tree | f9e7cdaa3d14a04be260f5cc7f5db132735e53ef /manifests/pnp4nagios/popup.pp | |
| parent | bad75052820f221df575a1942417712e35ab1af7 (diff) | |
| parent | 329c982fe6daec3ec5ac519eb623acc522d84d3b (diff) | |
Merge branch 'improve_resource_ordering' into 'master'
Improve resource ordering
See merge request !21
Diffstat (limited to 'manifests/pnp4nagios/popup.pp')
| -rw-r--r-- | manifests/pnp4nagios/popup.pp | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp index 0dc04b0..91136cc 100644 --- a/manifests/pnp4nagios/popup.pp +++ b/manifests/pnp4nagios/popup.pp @@ -1,19 +1,24 @@ -class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { +class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { File['pnp4nagios-templates.cfg']{ - source => [ 'puppet:///modules/site_nagios/pnp4nagios/pnp4nagios-popup-templates.cfg', - 'puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg' ], + source => [ + 'puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg', + 'puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg' ], } file { '/usr/share/nagios3/htdocs/ssi': - ensure => directory } + ensure => directory, + require => Package['nagios'], + } file { 'status-header.ssi': - path => '/usr/share/nagios3/htdocs/ssi/status-header.ssi', - source => [ 'puppet:///modules/site_nagios/pnp4nagios/status-header.ssi', - 'puppet:///modules/nagios/pnp4nagios/status-header.ssi' ], - mode => '0644', - owner => root, - group => root, - notify => Service['nagios'], + path => '/usr/share/nagios3/htdocs/ssi/status-header.ssi', + source => [ + 'puppet:///modules/site-nagios/pnp4nagios/status-header.ssi', + 'puppet:///modules/nagios/pnp4nagios/status-header.ssi'], + mode => '0644', + owner => root, + group => root, + notify => Service['nagios'], + require => Package['nagios'], } } |