From 985ec1fe0aee848b3d45e9f8accf6ff156b3af25 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 30 Dec 2012 15:43:06 +0100 Subject: Use the concat module instead of the concatenated_file defined (Closes: #4074) --- manifests/header_checks_snippet.pp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'manifests/header_checks_snippet.pp') diff --git a/manifests/header_checks_snippet.pp b/manifests/header_checks_snippet.pp index 454d219..6ffdad8 100644 --- a/manifests/header_checks_snippet.pp +++ b/manifests/header_checks_snippet.pp @@ -43,23 +43,20 @@ define postfix::header_checks_snippet ( include postfix::header_checks - $snippetfile = "${postfix::header_checks::postfix_header_checks_snippets_dir}/${name}" - - file { "$snippetfile": + $fragment = "postfix_header_checks_${name}" + + concat::fragment { "$fragment": ensure => "$ensure", - mode => 600, - owner => root, - group => 0, - notify => Exec["concat_${postfix::header_checks::postfix_merged_header_checks}"], + target => '/etc/postfix/header_checks', } if $source { - File["$snippetfile"] { + Concat::Fragment["$fragment"] { source => $source, } } else { - File["$snippetfile"] { + Concat::Fragment["$fragment"] { content => $content, } } -- cgit v1.2.3