X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fressource-limits.erb;fp=modules%2Fapache2%2Ftemplates%2Fressource-limits.erb;h=8ddb673621814feff8070d17ddfae9e24fae9e72;hb=c36d259889536d23d96a6a777e21a348954ef71c;hp=82e42776ad5d32f6941961096b1bbfe2c9fc5d68;hpb=b3d844c8b2976e9a46438ac027649e7af355650c;p=mirror%2Fdsa-puppet.git

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