Make ressource-limits a template

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 9d712a0038d22b74a970ebe7458f2c4c0c0f46de..8e9a7950e3484e384050be72484470405266b130 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,9 +1,14 @@
 class apache2 {
        package {
                apache2: ensure => installed;
+               logrotate: ensure => installed;
        }
 
        file {
+               "/etc/apache2/conf.d/ressource-limits":
+                       template("apache2/ressource-limits.erb"),
+                       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" ],
@@ -16,9 +21,9 @@ class apache2 {
                        require => Package["apache2"],
                        notify  => Exec["apache2 reload"];
 
-               "/etc/logroate.d/apache2":
-                       source  => [ "puppet:///apache2/per-host/$fqdn/etc/logroate.d/apache2",
-                                    "puppet:///apache2/common/etc/logroate.d/apache2" ];
+               "/etc/logrotate.d/apache2":
+                       source  => [ "puppet:///apache2/per-host/$fqdn/etc/logrotate.d/apache2",
+                                    "puppet:///apache2/common/etc/logrotate.d/apache2" ];
 
                "/srv/www":
                        mode    => 755,
@@ -30,11 +35,12 @@ class apache2 {
                        mode    => 755,
                        ensure  => directory;
                "/srv/www/default.debian.org/htdocs/index.html":
-                       content => template("default-index.html");
+                       content => template("apache2/default-index.html");
 
-               "/var/log/apache2":
-                       mode    => 755,
-                       ensure  => directory;
+               # sometimes this is a symlink
+               #"/var/log/apache2":
+               #       mode    => 755,
+               #       ensure  => directory;
        }
 
        exec { "apache2 reload":