X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=41c1403ef84287ac0e25654055bfa5a541886a78;hb=fc638d271d89c3847ae5ed34629ed43f55b70f1c;hp=c56d91047286fec38a9bf51a102ebdad79e85528;hpb=e4152fa31771473e3a5ffd8333727e9cebf1c0ea;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index c56d91047..41c1403ef 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -45,20 +45,16 @@ 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('sso') {
+		$memlimit = 512 * 1024 * 1024
+	} elsif has_role('popcon') {
+		$memlimit = 512 * 1024 * 1024
+	} elsif has_role('qamaster') {
+		$memlimit = 300 * 1024 * 1024
 	} else {
-		$memlimit = 64 * 1024 * 1024
+		$memlimit = 192 * 1024 * 1024
 	}
 
 	apache2::config { 'resource-limits':