X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fresource-limits.erb;h=10c6b41a2a66d1dca29932e1b4e522dcd460f1ed;hb=a459cc650774de8400f433bec40fbb1573c2cb3f;hp=b6bc329edafea03a75e4b92f8e198246dbdcee66;hpb=721ad7172f27a55de960d3f77c00ea649692be22;p=dsa-puppet.git

diff --git a/modules/apache2/templates/resource-limits.erb b/modules/apache2/templates/resource-limits.erb
index b6bc329e..10c6b41a 100644
--- a/modules/apache2/templates/resource-limits.erb
+++ b/modules/apache2/templates/resource-limits.erb
@@ -4,19 +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
-		else
-			"RLimitMEM "+(32 * 1024**2).to_s
-	end
-end
-%>
-RLimitNPROC 128
+RLimitMEM <%= @memlimit %>
+RLimitNPROC 256