From 3b8f94fcfa1c81c94227dcb01dad5a40e21a46d8 Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Sun, 15 Sep 2013 12:22:15 +0200 Subject: [PATCH] Key apache memory for buildd master on role, not host name --- .../apache2/templates/ressource-limits.erb | 20 +++++++++++-------- modules/debian-org/misc/local.yaml | 3 +++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/modules/apache2/templates/ressource-limits.erb b/modules/apache2/templates/ressource-limits.erb index 913714881..48875e54f 100644 --- a/modules/apache2/templates/ressource-limits.erb +++ b/modules/apache2/templates/ressource-limits.erb @@ -5,14 +5,18 @@ RLimitCPU 180 <%= -case fqdn - when "berlioz.debian.org" then - "" - when "grieg.debian.org", "tchaikovsky.debian.org" then - # buildd.debian.org - "RLimitMEM "+(96 * 1024**2).to_s - else - "RLimitMEM "+(32 * 1024**2).to_s +if scope.lookupvar('site::nodeinfo')['buildd_master'] then + # buildd.debian.org + "RLimitMEM "+(96 * 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 diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index 067b5b02a..f6628e646 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -369,3 +369,6 @@ host_settings: - klecker.debian.org - stanley.debian.org - senfter.debian.org + buildd_master: + - grieg.debian.org + - wuiet.debian.org -- 2.20.1