From: Martin Zobel-Helas <zobel@debian.org>
Date: Tue, 9 Aug 2011 14:36:34 +0000 (+0200)
Subject: merkel is no more
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d608b06d0993c869615acbabd170dc742adfcf77;p=mirror%2Fdsa-puppet.git

merkel is no more
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

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