sibelius needs more RAM for git-http-backend

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index b1abe28de68a1a26346343be8bc13fb048b31018..67e6b8bad288a357e84d029bd998e569648a75a5 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -37,24 +37,24 @@ 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
-       } elsif has_role('udd') {
+       if has_role('udd') {
                $memlimit = 512 * 1024 * 1024
+       } elsif has_role('sso') {
+               $memlimit = 512 * 1024 * 1024
+       } elsif has_role('qamaster') {
+               $memlimit = 300 * 1024 * 1024
+       } elsif has_role('snapshot_master') {
+               $memlimit = 300 * 1024 * 1024
        } else {
-               $memlimit = 32 * 1024 * 1024
+               $memlimit = 192 * 1024 * 1024
        }
 
        apache2::config { 'resource-limits':