X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=f29eeefeb310d484451e052b6522a8ab88219301;hb=0ddec3cf101140def15c2d0b7d608141a82e38f3;hp=b14d408d732709a54130e57ec24cd3ae5549a035;hpb=f833a1c122597f80da4d4095cae8d7d5bd852a7a;p=dsa-puppet.git

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