]> gitweb.fluxo.info Git - puppet-postfix.git/commitdiff
Updating header_checks_snippet to use concat
authorSilvio Rhatto <rhatto@riseup.net>
Mon, 21 Jan 2013 21:08:06 +0000 (19:08 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Mon, 21 Jan 2013 21:08:06 +0000 (19:08 -0200)
manifests/header_checks_snippet.pp

index 454d2197d09afcf35d5b24ad584c4d0b62575304..91d7501880026d8cd07ac976cc4a636bb05fbe88 100644 (file)
@@ -15,7 +15,7 @@ Example usage:
 
   node "toto.example.com" {
     include postfix
-    postfix::header_checks {
+    postfix::header_checks_snippet {
       'wrong_date': content => 'FIXME';
       'bla':        source => 'puppet:///files/etc/postfix/header_checks.d/bla';
     }
@@ -37,29 +37,22 @@ define postfix::header_checks_snippet (
     fail("Only one of \$source or \$content must specified for postfix::header_checks_snippet ${name}")
   }
 
-  if ($value == false) and ($ensure == "present") {
-    fail("The value parameter must be set when using the postfix::header_checks_snippet define with ensure=present.")
-  }
-
   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,
     }
   }