X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fapache2%2Ftemplates%2Fresource-limits.erb;h=48414884780d40d731b113626caec3119950e4e3;hb=519904b541156a155abaaa6db169ed9fab401ed3;hp=f0f4581434477896e873c290b1b41d71a1af6678;hpb=9f6b9b445c024d47e96cda19beea2f71c595c0bc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/resource-limits.erb b/modules/apache2/templates/resource-limits.erb
index f0f458143..484148847 100644
--- a/modules/apache2/templates/resource-limits.erb
+++ b/modules/apache2/templates/resource-limits.erb
@@ -4,21 +4,5 @@
 ##
 
 RLimitCPU 180
-<%=
-if scope.lookupvar('site::nodeinfo')['buildd_master'] then
-			# buildd.debian.org
-			"RLimitMEM "+(192 * 1024**2).to_s
-else
-	case fqdn
-		when "berlioz.debian.org" then
-			""
-		when "tchaikovsky.debian.org" then
-			"RLimitMEM "+(96 * 1024**2).to_s
-		when "quantz.debian.org" then
-			"RLimitMEM "+(96 * 1024**2).to_s
-		else
-			"RLimitMEM "+(32 * 1024**2).to_s
-	end
-end
-%>
-RLimitNPROC 128
+RLimitMEM <%= @rlimitmem %>
+RLimitNPROC <%= @rlimitnproc %>