Ensure that rlimit file just exist if value is not null

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index 52172063ae86e2d7982fd7c58f1ea640f3188d1a..52adacece51545503a2b819eeecb7d2fa651512e 100644 (file)
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -641,7 +641,10 @@ define vs_rlimit($vserver, $limit, $soft = '', $hard = '', $min = '', $ensure =
   file { "/etc/vservers/${vserver}/rlimits/$limit.soft":
     mode    => 0644, owner => root, group => root,
     content => "$soft\n",
-    ensure  => $ensure,
+    ensure  => $soft ? {
+      ''      => absent,
+      default => $ensure,
+    },
     require => File["/etc/vservers/${vserver}/rlimits"],
     notify  => Exec["vs_restart_${vserver}"],
   }
@@ -650,6 +653,10 @@ define vs_rlimit($vserver, $limit, $soft = '', $hard = '', $min = '', $ensure =
     mode    => 0644, owner => root, group => root,
     content => "$hard\n",
     ensure  => $ensure,
+    ensure  => $hard ? {
+      ''      => absent,
+      default => $ensure,
+    },
     require => File["/etc/vservers/${vserver}/rlimits"],
     notify  => Exec["vs_restart_${vserver}"],
   }
@@ -657,7 +664,10 @@ define vs_rlimit($vserver, $limit, $soft = '', $hard = '', $min = '', $ensure =
   file { "/etc/vservers/${vserver}/rlimits/$limit.min":
     mode    => 0644, owner => root, group => root,
     content => "$min\n",
-    ensure  => $ensure,
+    ensure  => $min? {
+      ''      => absent,
+      default => $ensure,
+    },
     require => File["/etc/vservers/${vserver}/rlimits"],
     notify  => Exec["vs_restart_${vserver}"],
   }