set apache ressource limits (RT#1481)

diff --git a/modules/apache2/files/common/etc/apache2/conf.d/ressource-limits b/modules/apache2/files/common/etc/apache2/conf.d/ressource-limits
new file mode 100644 (file)
index 0000000..7baabd1
--- /dev/null
+++ b/modules/apache2/files/common/etc/apache2/conf.d/ressource-limits
@@ -0,0 +1,3 @@
+RLimitCPU 180
+RLimitMEM 33554432
+RLimitNPROC 128

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 5283098605843db40c1155dbb43ab231ebceb8c1..a0af075b0ef88d2bbfbd09dff293962fd1432936 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -5,6 +5,11 @@ class apache2 {
        }
 
        file {
+               "/etc/apache2/conf.d/ressource-limits":
+                       source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/ressource-limits",
+                                    "puppet:///apache2/common/etc/apache2/conf.d/ressource-limits" ],
+                       require => Package["apache2"],
+                       notify  => Exec["apache2 reload"];
                "/etc/apache2/conf.d/security":
                        source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/security",
                                     "puppet:///apache2/common/etc/apache2/conf.d/security" ],