Fixed deprecation warnings "Files found in modules without specifying 'modules' in file path". This will break 0.24.x client compatibility.

This commit is contained in:
Timo Mkinen 2011-01-26 20:06:13 +02:00
parent 33be443516
commit 5475229cfd
28 changed files with 65 additions and 65 deletions

View file

@ -116,7 +116,7 @@ define munin::plugin($config = "") {
OpenBSD: {
file { "/usr/local/libexec/munin/plugins/${name}":
ensure => present,
source => "puppet:///munin/plugins/${name}",
source => "puppet:///modules/munin/plugins/${name}",
owner => root,
group => wheel,
mode => 0755,
@ -126,7 +126,7 @@ define munin::plugin($config = "") {
default: {
file { "/usr/share/munin/plugins/${name}":
ensure => present,
source => "puppet:///munin/plugins/${name}",
source => "puppet:///modules/munin/plugins/${name}",
owner => root,
group => root,
mode => 0755,
@ -140,7 +140,7 @@ define munin::plugin($config = "") {
ensure => present,
source => [ "puppet:///files/munin/plugin-conf/${config}.${fqdn}",
"puppet:///files/munin/plugin-conf/${config}",
"puppet:///munin/plugin-conf/${config}", ],
"puppet:///modules/munin/plugin-conf/${config}", ],
owner => root,
group => $operatingsystem ? {
OpenBSD => wheel,
@ -237,14 +237,14 @@ class munin::server {
owner => root,
group => root,
mode => 0644,
source => "puppet:///custom/empty",
source => "puppet:///modules/custom/empty",
require => Package["munin"],
}
file { "/etc/munin/munin.conf.in":
ensure => present,
source => [ "puppet:///files/munin/munin.conf.in",
"puppet:///munin/munin.conf.in", ],
"puppet:///modules/munin/munin.conf.in", ],
owner => root,
group => root,
mode => 0644,