X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=3rdparty%2Fmodules%2Fconcat%2Fmanifests%2Ffragment.pp;fp=3rdparty%2Fmodules%2Fconcat%2Fmanifests%2Ffragment.pp;h=7b13b004255216c3c6e7747bec386f445c9e3576;hb=917f80937c03a7f486d25fa70373f1f4d4b02958;hp=9cfae6613e23c10ef0d476a85fff9914e989bf37;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=dsa-puppet.git

diff --git a/3rdparty/modules/concat/manifests/fragment.pp b/3rdparty/modules/concat/manifests/fragment.pp
index 9cfae661..7b13b004 100644
--- a/3rdparty/modules/concat/manifests/fragment.pp
+++ b/3rdparty/modules/concat/manifests/fragment.pp
@@ -1,6 +1,6 @@
 # == Define: concat::fragment
 #
-# Creates a concat_fragment in the catalogue
+# Puts a file fragment into a directory previous setup using concat
 #
 # === Options:
 #
@@ -13,43 +13,121 @@
 # [*order*]
 #   By default all files gets a 10_ prefix in the directory you can set it to
 #   anything else using this to influence the order of the content in the file
+# [*ensure*]
+#   Present/Absent or destination to a file to include another file
+# [*mode*]
+#   Deprecated
+# [*owner*]
+#   Deprecated
+# [*group*]
+#   Deprecated
+# [*backup*]
+#   Deprecated
 #
 define concat::fragment(
     $target,
-    $ensure  = undef,
     $content = undef,
     $source  = undef,
     $order   = '10',
+    $ensure  = undef,
+    $mode    = undef,
+    $owner   = undef,
+    $group   = undef,
+    $backup  = undef
 ) {
   validate_string($target)
-
-  if $ensure != undef {
-    warning('The $ensure parameter to concat::fragment is deprecated and has no effect.')
-  }
-
   validate_string($content)
   if !(is_string($source) or is_array($source)) {
     fail('$source is not a string or an Array.')
   }
-
   if !(is_string($order) or is_integer($order)) {
     fail('$order is not a string or integer.')
   } elsif (is_string($order) and $order =~ /[:\n\/]/) {
     fail("Order cannot contain '/', ':', or '\n'.")
   }
+  if $mode {
+    warning('The $mode parameter to concat::fragment is deprecated and has no effect')
+  }
+  if $owner {
+    warning('The $owner parameter to concat::fragment is deprecated and has no effect')
+  }
+  if $group {
+    warning('The $group parameter to concat::fragment is deprecated and has no effect')
+  }
+  if $backup {
+    warning('The $backup parameter to concat::fragment is deprecated and has no effect')
+  }
 
-  if ! ($content or $source) {
-    crit('No content, source or symlink specified')
-  } elsif ($content and $source) {
-    fail("Can't use 'source' and 'content' at the same time")
+  $my_backup = concat_getparam(Concat[$target], 'backup')
+  $_backup = $my_backup ? {
+    ''      => undef,
+    default => $my_backup
   }
 
-  $safe_target_name = regsubst($target, '[/:\n\s]', '_', 'GM')
+  if $ensure == undef {
+    $my_ensure = concat_getparam(Concat[$target], 'ensure')
+  } else {
+    if ! ($ensure in [ 'present', 'absent' ]) {
+      warning('Passing a value other than \'present\' or \'absent\' as the $ensure parameter to concat::fragment is deprecated.  If you want to use the content of a file as a fragment please use the $source parameter.')
+    }
+    $my_ensure = $ensure
+  }
 
-  concat_fragment { $name:
-    tag     => $safe_target_name,
-    order   => $order,
-    content => $content,
+  include concat::setup
+
+  $safe_name        = regsubst($name, '[/:\n]', '_', 'GM')
+  $safe_target_name = regsubst($target, '[/:\n]', '_', 'GM')
+  $concatdir        = $concat::setup::concatdir
+  $fragdir          = "${concatdir}/${safe_target_name}"
+  $fragowner        = $concat::setup::fragment_owner
+  $fraggroup        = $concat::setup::fragment_group
+  $fragmode         = $concat::setup::fragment_mode
+
+  # The file type's semantics are problematic in that ensure => present will
+  # not over write a pre-existing symlink.  We are attempting to provide
+  # backwards compatiblity with previous concat::fragment versions that
+  # supported the file type's ensure => /target syntax
+
+  # be paranoid and only allow the fragment's file resource's ensure param to
+  # be file, absent, or a file target
+  $safe_ensure = $my_ensure ? {
+    ''        => 'file',
+    undef     => 'file',
+    'file'    => 'file',
+    'present' => 'file',
+    'absent'  => 'absent',
+    default   => $my_ensure,
+  }
+
+  # if it looks line ensure => /target syntax was used, fish that out
+  if ! ($my_ensure in ['', 'present', 'absent', 'file' ]) {
+    $ensure_target = $my_ensure
+  } else {
+    $ensure_target = undef
+  }
+
+  # the file type's semantics only allows one of: ensure => /target, content,
+  # or source
+  if ($ensure_target and $source) or
+    ($ensure_target and $content) or
+    ($source and $content) {
+    fail('You cannot specify more than one of $content, $source, $ensure => /target')
+  }
+
+  if ! ($content or $source or $ensure_target) {
+    crit('No content, source or symlink specified')
+  }
+
+  file { "${fragdir}/fragments/${order}_${safe_name}":
+    ensure  => $safe_ensure,
+    owner   => $fragowner,
+    group   => $fraggroup,
+    mode    => $fragmode,
     source  => $source,
+    content => $content,
+    backup  => $_backup,
+    replace => true,
+    alias   => "concat_fragment_${name}",
+    notify  => Exec["concat_${target}"]
   }
 }