X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=67e6b8bad288a357e84d029bd998e569648a75a5;hb=2628e0868dfe51ea135788ce1c79184a74c1cac6;hp=902424305e2120280a00deed2e2e879198333945;hpb=3e1cde239c61cb2059a10473f0693646ccbaf685;p=dsa-puppet.git

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