mv templates/default-index.html modules/apache2/templates/

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 9d712a0..706d40e 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 {
@@ -16,9 +17,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,7 +31,7 @@ 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,