X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fressource-limits.erb;h=8ddb673621814feff8070d17ddfae9e24fae9e72;hb=85fb85cdc8c20b0285b44dc23cef761377a4fb21;hp=9c4ea589a27c67f3a9a2cf1fca0f89789bef461e;hpb=5afbde09ed91eb6204b80475bac20e77697aabb9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/ressource-limits.erb b/modules/apache2/templates/ressource-limits.erb
index 9c4ea589a..8ddb67362 100644
--- a/modules/apache2/templates/ressource-limits.erb
+++ b/modules/apache2/templates/ressource-limits.erb
@@ -6,11 +6,12 @@
 RLimitCPU 180
 <%=
 case fqdn
+	when "merkel.debian.org" then "" # maybe unlimited will be better
 	when "cimarosa.debian.org" then
 		# buildd.debian.org
-		"RLimitMEM 96m"
+		"RLimitMEM "+(96 * 1024**2).to_s
 	else
-		"RLimitMEM 32m"
+		"RLimitMEM "+(32 * 1024**2).to_s
 end
 %>
 RLimitNPROC 128