summaryrefslogtreecommitdiff
path: root/manifests/setup.pp
diff options
context:
space:
mode:
authorErik Dalén <dalen@spotify.com>2012-03-14 18:02:43 +0100
committerErik Dalén <dalen@spotify.com>2012-04-24 16:53:20 +0200
commit800bec11aeacd64dac18935c6b6074ea6be14be9 (patch)
tree0e1ed626579555e62686dab401c2e56ff13bef20 /manifests/setup.pp
parentb4a80d46557bdededfa8ca3d17c605efcfd8334c (diff)
downloadpuppet-concat-800bec11aeacd64dac18935c6b6074ea6be14be9.tar.gz
puppet-concat-800bec11aeacd64dac18935c6b6074ea6be14be9.tar.bz2
Style guideline fixes
Comply better with puppet community style guidelines. Change-Id: Ie1782d266539b1a8f9890b2ade77280011aa22aa
Diffstat (limited to 'manifests/setup.pp')
-rw-r--r--manifests/setup.pp50
1 files changed, 24 insertions, 26 deletions
diff --git a/manifests/setup.pp b/manifests/setup.pp
index 584f58a..ce3f7ea 100644
--- a/manifests/setup.pp
+++ b/manifests/setup.pp
@@ -13,33 +13,31 @@
#
# It also copies out the concatfragments.sh file to ${concatdir}/bin
class concat::setup {
- $id = $::id
- $root_group = $id ? {
- root => 0,
- default => $id
- }
- $concatdir = $::concat_basedir
- $majorversion = regsubst($::puppetversion, '^[0-9]+[.]([0-9]+)[.][0-9]+$', '\1')
+ $id = $::id
+ $root_group = $id ? {
+ root => 0,
+ default => $id
+ }
+ $concatdir = $::concat_basedir
+ $majorversion = regsubst($::puppetversion, '^[0-9]+[.]([0-9]+)[.][0-9]+$', '\1')
- file{"${concatdir}/bin/concatfragments.sh":
- owner => $id,
- group => $root_group,
- mode => 755,
- 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'
+ };
- [ $concatdir, "${concatdir}/bin" ]:
- ensure => directory,
- owner => $id,
- group => $root_group,
- mode => '0750';
+ [ $concatdir, "${concatdir}/bin" ]:
+ ensure => directory,
+ owner => $id,
+ group => $root_group,
+ mode => '0750';
- ## Old versions of this module used a different path.
- '/usr/local/bin/concatfragments.sh':
- ensure => absent;
- }
+ ## Old versions of this module used a different path.
+ '/usr/local/bin/concatfragments.sh':
+ ensure => absent;
+ }
}
-
-# vi:tabstop=4:expandtab:ai