Simply exim config slightly by checking for roles in manifest

[dsa-puppet.git] / modules / apache2 / manifests / init.pp

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index b14d408d732709a54130e57ec24cd3ae5549a035..f29eeefeb310d484451e052b6522a8ab88219301 100644 (file)
--- 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