Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

[dsa-puppet.git] / modules / apache2 / manifests / init.pp

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index a0af075b0ef88d2bbfbd09dff293962fd1432936..0e74f7b1088bd14b366b6449832a27808335cf42 100644 (file)
--- 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" ],
+                       content => template("apache2/ressource-limits.erb"),
                        require => Package["apache2"],
                        notify  => Exec["apache2 reload"];
                "/etc/apache2/conf.d/security":