Permalink
Browse files

Merge pull request #32 from UnifiedPost/develop

Fixes various puppet-lint warnings.
  • Loading branch information...
2 parents 7490f60 + 370e602 commit e8e1282b6d367a202d2b63f967e4d2d484c16470 @ripienaar ripienaar committed Aug 30, 2012
Showing with 9 additions and 5 deletions.
  1. +3 −0 manifests/fragment.pp
  2. +1 −1 manifests/init.pp
  3. +5 −4 manifests/setup.pp
@@ -29,6 +29,9 @@
'', 'absent', 'present', 'file', 'directory': {
crit('No content, source or symlink specified')
}
+ default: {
+ #do nothing, make puppet-lint happy.
+ }
}
}
default: { File{ source => $source } }
View
@@ -218,8 +218,8 @@
}
file { $name:
- path => $path,
ensure => present,
+ path => $path,
alias => "concat_${name}",
group => $group,
mode => $mode,
View
@@ -26,15 +26,16 @@
}
$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,

0 comments on commit e8e1282

Please sign in to comment.