From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 28 May 2015 09:19:58 +0000 (+0200)
Subject: make 192 the new default
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b78d7dde9375ba05a5adbff0c8bf26ad0778c840;p=mirror%2Fdsa-puppet.git

make 192 the new default
---

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 902424305..8057e9a71 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -45,22 +45,10 @@ class apache2 {
 		ensure => absent,
 	}
 
-	if has_role('buildd_master') {
-		$memlimit = 192 * 1024 * 1024
-	} elsif has_role('buildd_ports_master') {
-		$memlimit = 192 * 1024 * 1024
-	} elsif has_role('nagiosmaster') {
-		$memlimit = 96 * 1024 * 1024
-	} elsif has_role('packagesqamaster') {
-		$memlimit = 192 * 1024 * 1024
-	} elsif has_role('nm') {
-		$memlimit = 96 * 1024 * 1024
-	} elsif has_role('udd') {
+	if has_role('udd') {
 		$memlimit = 512 * 1024 * 1024
-	} elsif has_role('soo') {
-		$memlimit = 192 * 1024 * 1024
 	} else {
-		$memlimit = 64 * 1024 * 1024
+		$memlimit = 192 * 1024 * 1024
 	}
 
 	apache2::config { 'resource-limits':