diff options
| author | Micah Anderson <micah@riseup.net> | 2013-02-14 18:50:00 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-02-14 18:50:00 -0500 |
| commit | 2bf3d8f17fae838982fcfa7a7c9e1833e65aec18 (patch) | |
| tree | 530de68d2f319dba8c9ad7e31c456893f866f3e2 | |
| parent | e72f4b51dbc9f183d60251de44e80149d88a1da3 (diff) | |
make site_nagios source primary, but allow fall-back to site-nagios
| -rw-r--r-- | manifests/pnp4nagios.pp | 12 | ||||
| -rw-r--r-- | manifests/pnp4nagios/popup.pp | 6 |
2 files changed, 12 insertions, 6 deletions
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, 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, |