X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=5283098605843db40c1155dbb43ab231ebceb8c1;hb=8b17990880da32b3489274c32bd9a2ca5bfc4b4f;hp=3a7efd2e5fb259af3fa527670480b3c90a93f468;hpb=33a3b0471f71840b631796f15318eaf64630d5a1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 3a7efd2e5..528309860 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 {
@@ -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":