From 800bec11aeacd64dac18935c6b6074ea6be14be9 Mon Sep 17 00:00:00 2001
From: Erik Dalén <dalen@spotify.com>
Date: Wed, 14 Mar 2012 18:02:43 +0100
Subject: Style guideline fixes

Comply better with puppet community style guidelines.

Change-Id: Ie1782d266539b1a8f9890b2ade77280011aa22aa
---
 manifests/setup.pp | 50 ++++++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

(limited to 'manifests/setup.pp')

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
-- 
cgit v1.2.3