From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 23 Aug 2009 08:31:00 +0000 (+0200)
Subject: set apache ressource limits (RT#1481)
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=37978abc1d086b93de416cbd89ec80c1547dc1b3;p=dsa-puppet.git

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
index 00000000..7baabd10
--- /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 52830986..a0af075b 100644
--- 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" ],