No more mail for @gobby

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index f29eeef..0470b64 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,3 +1,11 @@
+# = Class: apache2
+#
+# Standard apache config debian.org hosts
+#
+# == Sample Usage:
+#
+#   include apache2
+#
 class apache2 {
        package { 'apache2':
                ensure => installed,
@@ -34,13 +42,15 @@ class apache2 {
        }
 
        if has_role('buildd_master') {
-               $memlimit = 192 * 1024**2
+               $memlimit = 192 * 1024 * 1024
        } elsif has_role('nagiosmaster') {
-               $memlimit = 96 * 1024**2
+               $memlimit = 96 * 1024 * 1024
        } elsif has_role('packagesqamaster') {
-               $memlimit = 192 * 1024**2
+               $memlimit = 192 * 1024 * 1024
+       } elsif has_role('nm') {
+               $memlimit = 96 * 1024 * 1024
        } else {
-               $memlimit = 32 * 1024**2
+               $memlimit = 32 * 1024 * 1024
        }
 
        apache2::config { 'resource-limits':