summaryrefslogtreecommitdiff
path: root/manifests/setup.pp
diff options
context:
space:
mode:
authorJan Vansteenkiste <jan@vstone.eu>2012-08-30 12:33:50 +0200
committerJan Vansteenkiste <jan@vstone.eu>2012-08-30 12:33:50 +0200
commit370e60280d74ada1e2ed130034e34bb7955bc929 (patch)
tree7cf362052b91670c0f2982eda57112dc5d984d1d /manifests/setup.pp
parent7490f60302f0187d306c594d68b30a6d75bc18c8 (diff)
downloadpuppet-concat-370e60280d74ada1e2ed130034e34bb7955bc929.tar.gz
puppet-concat-370e60280d74ada1e2ed130034e34bb7955bc929.tar.bz2
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
Diffstat (limited to 'manifests/setup.pp')
-rw-r--r--manifests/setup.pp9
1 files changed, 5 insertions, 4 deletions
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,