use the correct parameter

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index b14d408..875e4ba 100644 (file)
--- 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':