From: Stephen Gran Date: Wed, 18 Nov 2009 00:41:10 +0000 (+0000) Subject: revert RLimitMem for merkel altogether X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c36d259889536d23d96a6a777e21a348954ef71c;p=mirror%2Fdsa-puppet.git revert RLimitMem for merkel altogether Signed-off-by: Stephen Gran --- diff --git a/modules/apache2/templates/ressource-limits.erb b/modules/apache2/templates/ressource-limits.erb index 82e42776a..8ddb67362 100644 --- a/modules/apache2/templates/ressource-limits.erb +++ b/modules/apache2/templates/ressource-limits.erb @@ -6,9 +6,7 @@ RLimitCPU 180 <%= case fqdn - when "merkel.debian.org" then - # search stuff - "RLimitMEM "+(128 * 1024**2).to_s + when "merkel.debian.org" then "" # maybe unlimited will be better when "cimarosa.debian.org" then # buildd.debian.org "RLimitMEM "+(96 * 1024**2).to_s