From b78d7dde9375ba05a5adbff0c8bf26ad0778c840 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 28 May 2015 11:19:58 +0200 Subject: [PATCH] make 192 the new default --- modules/apache2/manifests/init.pp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp index 902424305..8057e9a71 100644 --- a/modules/apache2/manifests/init.pp +++ b/modules/apache2/manifests/init.pp @@ -45,22 +45,10 @@ 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 } else { - $memlimit = 64 * 1024 * 1024 + $memlimit = 192 * 1024 * 1024 } apache2::config { 'resource-limits': -- 2.20.1