diff options
| author | varac <varacanero@zeromail.org> | 2015-04-10 16:04:12 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-04-10 16:04:12 +0200 |
| commit | e338207a1a85c0ad94a4dd6023dcfb9713e422cf (patch) | |
| tree | e4424fcbd21478c52ee370574205dae2980a2eba /manifests/pnp4nagios/popup.pp | |
| parent | 22ec34bca99709c8542a817158b5e96249972645 (diff) | |
| parent | 300f1d39682d47e7bcc66b82f21dec15bb41b4e9 (diff) | |
Merge remote-tracking branch 'leap/master' into varac_master
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'], } } |