Move all roles from local.yaml to hiera

[dsa-puppet.git] / modules / apache2 / templates / resource-limits.erb

diff --git a/modules/apache2/templates/resource-limits.erb b/modules/apache2/templates/resource-limits.erb
index 185db4e4c09d3aa392e0194cba9bb067dae61908..895b93ce46d995978a92a1c608ea2bebdf0d8bbc 100644 (file)
--- 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