Revert snapshot memory increase, dropped git http smart stuff instead.

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 902424305e2120280a00deed2e2e879198333945..60538d4d8a5ec54dcc40699cab3cd3c046a87020 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -45,22 +45,14 @@ class apache2 {
                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
-       } elsif has_role('udd') {
+       if has_role('udd') {
                $memlimit = 512 * 1024 * 1024
-       } elsif has_role('soo') {
-               $memlimit = 192 * 1024 * 1024
+       } elsif has_role('sso') {
+               $memlimit = 512 * 1024 * 1024
+       } elsif has_role('qamaster') {
+               $memlimit = 300 * 1024 * 1024
        } else {
-               $memlimit = 64 * 1024 * 1024
+               $memlimit = 192 * 1024 * 1024
        }
 
        apache2::config { 'resource-limits':