From 370e60280d74ada1e2ed130034e34bb7955bc929 Mon Sep 17 00:00:00 2001 From: Jan Vansteenkiste Date: Thu, 30 Aug 2012 12:33:50 +0200 Subject: Fixes various puppet-lint warnings. * ./manifests/init.pp - WARNING: ensure found on line but it's not the first attribute on line 222 * ./manifests/setup.pp - WARNING: selector inside resource block on line 34 * ./manifests/fragment.pp - WARNING: case statement without a default case on line 28 --- manifests/setup.pp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'manifests/setup.pp') diff --git a/manifests/setup.pp b/manifests/setup.pp index 38aeb96..fc6cb93 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -26,15 +26,16 @@ class concat::setup { } $majorversion = regsubst($::puppetversion, '^[0-9]+[.]([0-9]+)[.][0-9]+$', '\1') + $fragments_source = $majorversion ? { + 24 => 'puppet:///concat/concatfragments.sh', + default => 'puppet:///modules/concat/concatfragments.sh' + } file{"${concatdir}/bin/concatfragments.sh": owner => $id, group => $root_group, mode => '0755', - source => $majorversion ? { - 24 => 'puppet:///concat/concatfragments.sh', - default => 'puppet:///modules/concat/concatfragments.sh' - }; + source => $fragments_source; [ $concatdir, "${concatdir}/bin" ]: ensure => directory, -- cgit v1.2.3