Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

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

diff --git a/modules/apache2/templates/ressource-limits.erb b/modules/apache2/templates/ressource-limits.erb
index 9c4ea58..f69d5e3 100644 (file)
--- a/modules/apache2/templates/ressource-limits.erb
+++ b/modules/apache2/templates/ressource-limits.erb
@@ -6,11 +6,12 @@
 RLimitCPU 180
 <%=
 case fqdn
-       when "cimarosa.debian.org" then
+       when "merkel.debian.org" then "" # maybe unlimited will be better
+       when "grieg.debian.org", "tchaikovsky.debian.org" then
                # buildd.debian.org
-               "RLimitMEM 96m"
+               "RLimitMEM "+(96 * 1024**2).to_s
        else
-               "RLimitMEM 32m"
+               "RLimitMEM "+(32 * 1024**2).to_s
 end
 %>
 RLimitNPROC 128