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=545cc25c285130dc698343b7678af4a10c1c8740;hb=d608b06d0993c869615acbabd170dc742adfcf77;hp=f69d5e3a32a6597031b6a0b94deee15663b5cb19;hpb=3561e0cdfcd7bb773c6431f56409002f632ad083;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/ressource-limits.erb b/modules/apache2/templates/ressource-limits.erb
index f69d5e3a3..545cc25c2 100644
--- a/modules/apache2/templates/ressource-limits.erb
+++ b/modules/apache2/templates/ressource-limits.erb
@@ -6,7 +6,6 @@
 RLimitCPU 180
 <%=
 case fqdn
-	when "merkel.debian.org" then "" # maybe unlimited will be better
 	when "grieg.debian.org", "tchaikovsky.debian.org" then
 		# buildd.debian.org
 		"RLimitMEM "+(96 * 1024**2).to_s