make 192 the new default

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 66ee3df66132dd3025ecb35a79bf66c34310763f..8057e9a711e5e34dea4cc457b390d438566bc2f9 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -37,22 +37,18 @@ class apache2 {
                ensure => absent,
        }
 
+       apache2::config { 'serve-cgi-bin':
+               ensure => absent,
+       }
+
        apache2::config { 'ressource-limits':
                ensure => absent,
        }
 
-       if has_role('buildd_master') {
-               $memlimit = 192 * 1024 * 1024
-       } elsif has_role('buildd_ports_master') {
-               $memlimit = 192 * 1024 * 1024
-       } elsif has_role('nagiosmaster') {
-               $memlimit = 96 * 1024 * 1024
-       } elsif has_role('packagesqamaster') {
-               $memlimit = 192 * 1024 * 1024
-       } elsif has_role('nm') {
-               $memlimit = 96 * 1024 * 1024
+       if has_role('udd') {
+               $memlimit = 512 * 1024 * 1024
        } else {
-               $memlimit = 32 * 1024 * 1024
+               $memlimit = 192 * 1024 * 1024
        }
 
        apache2::config { 'resource-limits':
@@ -89,7 +85,7 @@ class apache2 {
 
        if $::lsbmajdistrelease > 7 {
                file { '/etc/apache2/mods-available/mpm_worker.conf':
-                       content => template('apache2/mpm_worker'),
+                       content => template('apache2/mpm_worker.erb'),
                }
        }