do not replace /var/log/apache2 symlinks with directories

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 3a7efd2..5283098 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,6 +1,7 @@
 class apache2 {
        package {
                apache2: ensure => installed;
+               logrotate: ensure => installed;
        }
 
        file {
@@ -30,11 +31,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":