X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fapache2%2Ftemplates%2Fressource-limits.erb;h=8ddb673621814feff8070d17ddfae9e24fae9e72;hb=0724a0f0b6f013d4ab050d8d908566c13fc5b474;hp=66cc046207e4723ce78a63185afac8f81aad885b;hpb=bb73f8c3ee65404e98245d77ff45ec79da76c1eb;p=mirror%2Fdsa-puppet.git

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