From 370e60280d74ada1e2ed130034e34bb7955bc929 Mon Sep 17 00:00:00 2001
From: Jan Vansteenkiste <jan@vstone.eu>
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/fragment.pp | 3 +++
 manifests/init.pp     | 2 +-
 manifests/setup.pp    | 9 +++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/manifests/fragment.pp b/manifests/fragment.pp
index 908d565..68bfd9b 100644
--- a/manifests/fragment.pp
+++ b/manifests/fragment.pp
@@ -29,6 +29,9 @@ define concat::fragment($target, $content='', $source='', $order=10, $ensure = '
             '', 'absent', 'present', 'file', 'directory': {
               crit('No content, source or symlink specified')
             }
+            default: {
+              #do nothing, make puppet-lint happy.
+            }
           }
         }
         default: { File{ source => $source } }
diff --git a/manifests/init.pp b/manifests/init.pp
index 8398e92..960098d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -218,8 +218,8 @@ define concat(
   }
 
   file { $name:
-    path     => $path,
     ensure   => present,
+    path     => $path,
     alias    => "concat_${name}",
     group    => $group,
     mode     => $mode,
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