X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=706d40e13d30de18caff49513e5aa41781d53a4d;hb=3a86558be6cb8f0e991f84c3028990603edd5da0;hp=9d712a0038d22b74a970ebe7458f2c4c0c0f46de;hpb=a03c85261ca9724f599adf09d3b4b731200b0731;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 9d712a003..706d40e13 100644
--- 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,