From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 Sep 2009 15:32:20 +0000 (+0200)
Subject: Make ressource-limits a template
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bfadb0dacfb052cfe3e9d8837cc4ec63da74b7c8;hp=fff51c90f9702246b4b148bf69282cfdb07d8e71;p=dsa-puppet.git

Make ressource-limits a template
---

diff --git a/modules/apache2/files/common/etc/apache2/conf.d/ressource-limits b/modules/apache2/files/common/etc/apache2/conf.d/ressource-limits
deleted file mode 100644
index 040313fc..00000000
--- a/modules/apache2/files/common/etc/apache2/conf.d/ressource-limits
+++ /dev/null
@@ -1,8 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-RLimitCPU 180
-RLimitMEM 67108864
-RLimitNPROC 128
diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index a0af075b..8e9a7950 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -6,8 +6,7 @@ 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" ],
+			template("apache2/ressource-limits.erb"),
 			require => Package["apache2"],
 			notify  => Exec["apache2 reload"];
 		"/etc/apache2/conf.d/security":
diff --git a/modules/apache2/templates/ressource-limits.erb b/modules/apache2/templates/ressource-limits.erb
new file mode 100644
index 00000000..040313fc
--- /dev/null
+++ b/modules/apache2/templates/ressource-limits.erb
@@ -0,0 +1,8 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+RLimitCPU 180
+RLimitMEM 67108864
+RLimitNPROC 128