partially get rlimitmem from class param

diff --git a/hieradata/nodes/cgi-grnet-01.debian.org.yaml b/hieradata/nodes/cgi-grnet-01.debian.org.yaml
index 4fb099d..faf1bba 100644 (file)
--- a/hieradata/nodes/cgi-grnet-01.debian.org.yaml
+++ b/hieradata/nodes/cgi-grnet-01.debian.org.yaml
@@ -4,3 +4,5 @@ classes:
   - roles::dgit_browse
   - roles::dgit_git
   - roles::search_frontend
+
+apache2::rlimitmem: 512 * 1024 * 1024

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 718f02b..f7a69a1 100644 (file)
--- 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,8 +56,6 @@ 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') {
@@ -63,7 +63,7 @@ class apache2(
   } elsif has_role('qamaster') {
     $memlimit = 300 * 1024 * 1024
   } else {
-    $memlimit = 192 * 1024 * 1024
+    $memlimit = $rlimitmem
   }
 
   apache2::config { 'resource-limits':