From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 15 Sep 2013 10:22:15 +0000 (+0200)
Subject: Key apache memory for buildd master on role, not host name
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=3b8f94fcfa1c81c94227dcb01dad5a40e21a46d8

Key apache memory for buildd master on role, not host name
---

diff --git a/modules/apache2/templates/ressource-limits.erb b/modules/apache2/templates/ressource-limits.erb
index 91371488..48875e54 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 067b5b02..f6628e64 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