From 2bf3d8f17fae838982fcfa7a7c9e1833e65aec18 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 14 Feb 2013 18:50:00 -0500 Subject: make site_nagios source primary, but allow fall-back to site-nagios --- manifests/pnp4nagios/popup.pp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'manifests/pnp4nagios/popup.pp') diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp index 80f8def..b90f163 100644 --- a/manifests/pnp4nagios/popup.pp +++ b/manifests/pnp4nagios/popup.pp @@ -1,6 +1,7 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { File['pnp4nagios-templates.cfg']{ - source => [ 'puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg', + source => [ 'puppet:///modules/site_nagios/pnp4nagios/pnp4nagios-popup-templates.cfg', + 'puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg', 'puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg' ], } @@ -9,7 +10,8 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { file { 'status-header.ssi': path => '/usr/share/nagios3/htdocs/ssi/status-header.ssi', - source => [ 'puppet:///modules/site-nagios/pnp4nagios/status-header.ssi', + source => [ 'puppet:///modules/site_nagios/pnp4nagios/status-header.ssi', + 'puppet:///modules/site-nagios/pnp4nagios/status-header.ssi', 'puppet:///modules/nagios/pnp4nagios/status-header.ssi' ], mode => '0644', owner => root, -- cgit v1.2.3