From fd5171f5785867d5a42fb83e08bbab85d53c2557 Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Wed, 18 Jul 2012 15:13:49 -0400 Subject: add 2.6.x compatibility to the default value of $module using $name in a default value doesn't work in 2.6.x, we need to verify the argument's value inside the manifests. Signed-off-by: Gabriel Filion --- manifests/module.pp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'manifests') diff --git a/manifests/module.pp b/manifests/module.pp index 73aeb29..1b45dea 100644 --- a/manifests/module.pp +++ b/manifests/module.pp @@ -1,23 +1,28 @@ define apache::module ( $ensure = present, $source = '', - $destination = '', $module = $name, $package_name = '' ) + $destination = '', $module = '', $package_name = '' ) { + $real_module = $module ? { + '' => $name, + default => $module, + } + case $operatingsystem { 'centos': { - apache::centos::module { "$module": + apache::centos::module { "$real_module": ensure => $ensure, source => $source, destination => $destination } } 'gentoo': { - apache::gentoo::module { "$module": + apache::gentoo::module { "$real_module": ensure => $ensure, source => $source, destination => $destination } } 'debian','ubuntu': { - apache::debian::module { "$module": + apache::debian::module { "$real_module": ensure => $ensure, package_name => $package_name } } -- cgit v1.2.3