more fixes for the munin modularizsation

git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@178 f03ff2f1-f02d-0410-970d-b9634babeaa1

diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp
index 865a1eea6d5d3fe116a25d369f269e43272cd83e..140ac35320b04a86de07df2b4b8bac8c78081203 100644 (file)
--- a/manifests/defines/concatenated_file.pp
+++ b/manifests/defines/concatenated_file.pp
@@ -36,7 +36,7 @@ define concatenated_file (
        }
 
        # if there is a header or footer file, add it
-       $additional_cmd = "$header" ? {
+       $additional_cmd = $header ? {
                '' => $footer ? {
                        '' => '',
                        default => "| cat - '${footer}' "
@@ -48,7 +48,7 @@ define concatenated_file (
        }
 
        # use >| to force clobbering the target file
-       exec { "/usr/bin/find ${dir} -maxdepth 1 -type f ! -name '*puppettmp' -print0 | sort -z | xargs -0 cat ${header_cmd} >| ${name}.puppettmp":
+       exec { "/usr/bin/find ${dir} -maxdepth 1 -type f ! -name '*puppettmp' -print0 | sort -z | xargs -0 cat ${additional_cmd} >| ${name}":
                refreshonly => true,
                subscribe => File[$dir],
                before => File[$name],

diff --git a/manifests/defines/puppet_install.pp b/manifests/defines/puppet_install.pp
index b6e52883b21258a4e68e73e414a9b380fd187b91..5f4d62d25336f8747fdf5680cc1ff2fc2122cf00 100644 (file)
--- a/manifests/defines/puppet_install.pp
+++ b/manifests/defines/puppet_install.pp
@@ -3,9 +3,6 @@
 # See LICENSE for the full license granted to you.
 
 define puppet::function($source) {
-       $destination = $type ? {
-               "fact" => "${rubysitedir}/facter/${name}.rb",
-       }
        file {
                "${rubysitedir}/puppet/parser/functions/${name}.rb":
                        source => $source,