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=82e42776ad5d32f6941961096b1bbfe2c9fc5d68;hb=b3d844c8b2976e9a46438ac027649e7af355650c;hp=66cc046207e4723ce78a63185afac8f81aad885b;hpb=c8154aefab48452d86b2a307e3398a12ac41e07b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/ressource-limits.erb b/modules/apache2/templates/ressource-limits.erb
index 66cc04620..82e42776a 100644
--- a/modules/apache2/templates/ressource-limits.erb
+++ b/modules/apache2/templates/ressource-limits.erb
@@ -6,6 +6,9 @@
 RLimitCPU 180
 <%=
 case fqdn
+	when "merkel.debian.org" then
+		# search stuff
+		"RLimitMEM "+(128 * 1024**2).to_s
 	when "cimarosa.debian.org" then
 		# buildd.debian.org
 		"RLimitMEM "+(96 * 1024**2).to_s