From 2bf3d8f17fae838982fcfa7a7c9e1833e65aec18 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Thu, 14 Feb 2013 18:50:00 -0500
Subject: make site_nagios source primary, but allow fall-back to site-nagios

---
 manifests/pnp4nagios.pp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'manifests/pnp4nagios.pp')

diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp
index e7d2be1..d8ee85e 100644
--- a/manifests/pnp4nagios.pp
+++ b/manifests/pnp4nagios.pp
@@ -11,7 +11,8 @@ class nagios::pnp4nagios {
 
   file { 'pnp4nagios-templates.cfg':
     path   => "${nagios::defaults::vars::int_cfgdir}/conf.d/pnp4nagios-templates.cfg",
-    source => [ 'puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg',
+    source => [ 'puppet:///modules/site_nagios/pnp4nagios/pnp4nagios-templates.cfg',
+                'puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg',
                 'puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg' ],
     mode   => '0644',
     owner  => root,
@@ -21,7 +22,8 @@ class nagios::pnp4nagios {
 
   file { 'apache.conf':
     path    => '/etc/pnp4nagios/apache.conf',
-    source  => [ 'puppet:///modules/site-nagios/pnp4nagios/apache.conf',
+    source  => [ 'puppet:///modules/site_nagios/pnp4nagios/apache.conf',
+                 'puppet:///modules/site-nagios/pnp4nagios/apache.conf',
                  'puppet:///modules/nagios/pnp4nagios/apache.conf' ],
     mode    => '0644',
     owner   => root,
@@ -34,7 +36,8 @@ class nagios::pnp4nagios {
 
   file { '/etc/default/npcd':
     path   => '/etc/default/npcd',
-    source => [ 'puppet:///modules/site-nagios/pnp4nagios/npcd',
+    source => [ 'puppet:///modules/site_nagios/pnp4nagios/npcd',
+                'puppet:///modules/site-nagios/pnp4nagios/npcd',
                 'puppet:///modules/nagios/pnp4nagios/npcd' ],
     mode   => '0644',
     owner  => root,
@@ -53,7 +56,8 @@ class nagios::pnp4nagios {
 
   file { '/usr/share/nagios3/htdocs/images/action.gif':
     path   => '/usr/share/nagios3/htdocs/images/action.gif',
-    source => [ 'puppet:///modules/site-nagios/pnp4nagios/action.gif',
+    source => [ 'puppet:///modules/site_nagios/pnp4nagios/action.gif',
+                'puppet:///modules/site-nagios/pnp4nagios/action.gif',
                 'puppet:///modules/nagios/pnp4nagios/action.gif' ],
     mode   => '0644',
     owner  => root,
-- 
cgit v1.2.3