From bfadb0dacfb052cfe3e9d8837cc4ec63da74b7c8 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 5 Sep 2009 17:32:20 +0200 Subject: [PATCH] Make ressource-limits a template --- modules/apache2/manifests/init.pp | 3 +-- .../conf.d/ressource-limits => templates/ressource-limits.erb} | 0 2 files changed, 1 insertion(+), 2 deletions(-) rename modules/apache2/{files/common/etc/apache2/conf.d/ressource-limits => templates/ressource-limits.erb} (100%) diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp index a0af075b0..8e9a7950e 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/files/common/etc/apache2/conf.d/ressource-limits b/modules/apache2/templates/ressource-limits.erb similarity index 100% rename from modules/apache2/files/common/etc/apache2/conf.d/ressource-limits rename to modules/apache2/templates/ressource-limits.erb -- 2.20.1