X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=875e4ba012286e88131275918b83dad04b67f603;hb=9e99e0d5879a438ae914213bdd3d673471818131;hp=b14d408d732709a54130e57ec24cd3ae5549a035;hpb=f833a1c122597f80da4d4095cae8d7d5bd852a7a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index b14d408d7..875e4ba01 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -33,14 +33,14 @@ class apache2 {
 		ensure => absent,
 	}
 
-	if $::fqdn in $site::roles['buildd_master'] {
-		$memlimit = 192 * 1024**2
-	} elsif $::fqdn in $site::roles['nagiosmaster']{
-		$memlimit = 96 * 1024**2
-	} elsif $::fqdn in $site::roles['packagesqamaster']{
-		$memlimit = 192 * 1024**2
+	if has_role('buildd_master') {
+		$memlimit = 192 * 1024 * 1024
+	} elsif has_role('nagiosmaster') {
+		$memlimit = 96 * 1024 * 1024
+	} elsif has_role('packagesqamaster') {
+		$memlimit = 192 * 1024 * 1024
 	} else {
-		$memlimit = 32 * 1024**2
+		$memlimit = 32 * 1024 * 1024
 	}
 
 	apache2::config { 'resource-limits':