diff options
| author | Micah Anderson <micah@riseup.net> | 2010-04-12 18:37:47 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2010-04-12 18:37:47 -0400 |
| commit | b8350a47d67e82788803e2c064106490764867a5 (patch) | |
| tree | b513cfa2fcd27ca4c6d9bbc9e5ebfabe07efd514 | |
| parent | a5c6eebcc82e31e13599ee7c3085548feb9ab05d (diff) | |
update file resource source parameters to use the 0.25 style modules pathing
this also adds a site-nagios possibility to one file resource where it was missing (nagios_private_resource.cfg)
although this module was updated for this purpose some time ago, it was still complaining:
Apr 12 15:13:10 puppetmaster puppetmasterd[11189]: DEPRECATION NOTICE: Files found in modules without specifying 'modules' in file path will be deprecated in the next major release. Please fix module 'nagios' when no 0.24.x clients are present
| -rw-r--r-- | manifests/base.pp | 3 | ||||
| -rw-r--r-- | manifests/nsca/client.pp | 6 | ||||
| -rw-r--r-- | manifests/nsca/server.pp | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 6106ab2..83ac792 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -54,7 +54,8 @@ class nagios::base { file { 'nagios_private_resource_cfg': path => "${nagios_cfgdir}/private/resource.cfg", - source => "puppet://$server/nagios/configs/${operatingsystem}/private/resource.cfg.${architecture}", + source => [ "puppet://$server/modules/nagios/configs/${operatingsystem}/private/resource.cfg.${architecture}", + "puppet://$server/modules/site-nagios/configs/${operatingsystem}/private/resource.cfg.${architecture}" ], notify => Service['nagios'], owner => root, group => nagios, mode => '0640'; } diff --git a/manifests/nsca/client.pp b/manifests/nsca/client.pp index b4ca878..5314b3d 100644 --- a/manifests/nsca/client.pp +++ b/manifests/nsca/client.pp @@ -3,9 +3,9 @@ class nagios::nsca::client { package { 'nsca': ensure => installed } file { '/etc/send_nsca.cfg': - source => [ "puppet://${server}/site-nagios/nsca/{$fqdn}/send_nsca.cfg", - "puppet://${server}/site-nagios/nsca/send_nsca.cfg", - "puppet://${server}/nagios/nsca/send_nsca.cfg" ], + source => [ "puppet://${server}/modules/site-nagios/nsca/{$fqdn}/send_nsca.cfg", + "puppet://${server}/modules/site-nagios/nsca/send_nsca.cfg", + "puppet://${server}/modules/nagios/nsca/send_nsca.cfg" ], owner => 'nagios', group => 'nogroup', mode => '400', diff --git a/manifests/nsca/server.pp b/manifests/nsca/server.pp index c682e24..e1cb83c 100644 --- a/manifests/nsca/server.pp +++ b/manifests/nsca/server.pp @@ -9,9 +9,9 @@ class nagios::nsca::server { } file { '/etc/nsca.cfg': - source => [ "puppet://${server}/site-nagios/nsca/{$fqdn}/nsca.cfg", - "puppet://${server}/site-nagios/nsca/nsca.cfg", - "puppet://${server}/nagios/nsca/nsca.cfg" ], + source => [ "puppet://${server}/modules/site-nagios/nsca/{$fqdn}/nsca.cfg", + "puppet://${server}/modules/site-nagios/nsca/nsca.cfg", + "puppet://${server}/modules/nagios/nsca/nsca.cfg" ], owner => 'nagios', group => 'nogroup', mode => '400', |