X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=d998e881863c6f086bc41d0f4f8f4acbfb75c46f;hb=69fbd668fcafaa6a02007acb59210367ee18ec7f;hp=718f02b5d8512b0ee311b7cd0238dec0e693d1c0;hpb=d88b26cb9fad29c6f0d42b21889ecc55d5e766bb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 718f02b5d..d998e8818 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -11,11 +11,13 @@
 #                                  script heavy (say the bug tracking system), set this
 #                                  to reduce the number of worker threads.
 # @param rlimitnproc A resource limit for number of processes.  The default is usually fine.
+# @param rlimitmem   A resource limit for memory usage.  The default is usually fine.
 # @param public Whether this host's apache should be accessible from the public internet.
 #               Sets appropriate firewall rules and optionally rate limits.
 class apache2(
   Boolean $smaller_number_of_threads = false,
   Integer $rlimitnproc = 256,
+  Integer $rlimitmem = 192 * 1024 * 1024,
   Boolean $public = true,
 ) {
   include webserver
@@ -54,16 +56,12 @@ class apache2(
 
   if has_role('udd') {
     $memlimit = 512 * 1024 * 1024
-  } elsif has_role('dgit_git') {
-    $memlimit = 512 * 1024 * 1024
-  } elsif has_role('sso') {
-    $memlimit = 512 * 1024 * 1024
   } elsif has_role('popcon') {
     $memlimit = 512 * 1024 * 1024
   } elsif has_role('qamaster') {
     $memlimit = 300 * 1024 * 1024
   } else {
-    $memlimit = 192 * 1024 * 1024
+    $memlimit = $rlimitmem
   }
 
   apache2::config { 'resource-limits':