X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fresource-limits.erb;h=10c6b41a2a66d1dca29932e1b4e522dcd460f1ed;hb=3ce155eb07bfbe2ebeba80248ff92abf4d6cd147;hp=185db4e4c09d3aa392e0194cba9bb067dae61908;hpb=f02aee38f97039918e6aae1c76a5e4a27e96c72b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/resource-limits.erb b/modules/apache2/templates/resource-limits.erb
index 185db4e4c..10c6b41a2 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
-%>
-RLimitNPROC 128
+RLimitMEM <%= @memlimit %>
+RLimitNPROC 256