X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fresource-limits.erb;h=895b93ce46d995978a92a1c608ea2bebdf0d8bbc;hb=f833a1c122597f80da4d4095cae8d7d5bd852a7a;hp=185db4e4c09d3aa392e0194cba9bb067dae61908;hpb=471af36728deb747a65afdba3c717d25ee9e57c5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/resource-limits.erb b/modules/apache2/templates/resource-limits.erb
index 185db4e4c..895b93ce4 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 "+(192 * 1024**2).to_s
-		else
-			"RLimitMEM "+(32 * 1024**2).to_s
-	end
-end
-%>
+RLimitMEM <%= @memlimit %>
 RLimitNPROC 128