X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=0e74f7b1088bd14b366b6449832a27808335cf42;hb=ab2083412262a2760e8ec30a8f4d1dbfa6def3c5;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..0e74f7b10 100644
--- 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":
+			content => 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" ],
@@ -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":