From b8350a47d67e82788803e2c064106490764867a5 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 12 Apr 2010 18:37:47 -0400 Subject: 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 --- manifests/base.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'manifests/base.pp') 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'; } -- cgit v1.2.3