Allow disabling of vserver memory limit

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index 26f44143c4a6d413a910894f7dc8a9d3803df404..ec9885af8a1757d21220100718e839e56685393e 100644 (file)
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -157,18 +157,36 @@ define vs_create($in_domain, $context, $legacy = false, $distro = 'etch',
   }
 
   case $memory_limit {
-    false: { }
+    false: {
+      file { "/etc/vservers/${vs_name}/rlimits/rss.hard":
+        mode   => 0644, owner => root, group => root,
+        ensure => absent,
+      }
+
+      file { "/etc/vservers/${vs_name}/rlimits/rss.soft":
+        mode   => 0644, owner => root, group => root,
+        ensure => absent,
+      }
+
+      vs_cflags { "${vs_name}-virt_mem":
+        vserver => $vs_name,
+        flag    => "virt_mem",
+        ensure  => absent,
+      }
+    }
     default: {
       file { "/etc/vservers/${vs_name}/rlimits":
         ensure => directory,
         mode => 0755, owner => root, group => root,
         require => Exec["vs_create_${vs_name}"],
       }
+
       file { "/etc/vservers/${vs_name}/rlimits/rss.hard":
         mode => 0644, owner => root, group => root,
         content => template("virtual/rss.hard.erb"),
         require => File["/etc/vservers/${vs_name}/rlimits"],
       }
+
       file { "/etc/vservers/${vs_name}/rlimits/rss.soft":
         mode => 0644, owner => root, group => root,
         content => template("virtual/rss.soft.erb"),