X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=64bf7ffc87e0d777ad6c81eb9c001536b884e3ff;hb=dbcdb9d9a519274894d87ed1f4dd9b5393da06b1;hp=20a963f3a46fcaf36cbf5b9fa0bb60be59566e63;hpb=fba81eb4a038c11fe783d3b06ace198721844724;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 20a963f3a..64bf7ffc8 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -63,12 +63,6 @@ class apache2(
     ensure => absent,
   }
 
-  if has_role('popcon') {
-    $memlimit = 512 * 1024 * 1024
-  } else {
-    $memlimit = $rlimitmem
-  }
-
   apache2::config { 'resource-limits':
     content => template('apache2/resource-limits.erb'),
   }