Merge branch 'master' of github.com:/example42/puppet-tp

example42 · Mar 2, 2020 · a5e23ed · a5e23ed
2 parents 86c3fd6 + cacc4ed
commit a5e23ed
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/functions/ensure2dir.pp b/functions/ensure2dir.pp
@@ -1,6 +1,5 @@
 function tp::ensure2dir (
   Variant[Boolean,String] $input  = present,
-  $default = undef,
 ) {
 
   $output = $input ? {

diff --git a/functions/ensure2file.pp b/functions/ensure2file.pp
@@ -0,0 +1,11 @@
+function tp::ensure2file (
+  Variant[Boolean,String] $input  = present,
+) {
+
+  $output = $input ? {
+    'absent'  => absent,
+    false     => absent,
+    default   => present,
+  }
+
+}
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -291,7 +291,7 @@
 
   # Manage additional tp::conf as in conf_hash
   $conf_defaults = {
-    'ensure'        => $ensure,
+    'ensure'        => tp::ensure2file($ensure),
     'settings_hash' => $settings,
     'options_hash'  => $options_hash,
   }
@@ -305,7 +305,7 @@
 
   # Manage additional tp::dir as in dir_hash
   $dir_defaults = {
-    'ensure'        => $ensure,
+    'ensure'        => tp::ensure2dir($ensure),
     'settings_hash' => $settings,
   }
   if $dir_hash != {} {