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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 487409f6b..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 {
@@ -15,11 +16,27 @@ class apache2 {
 			             "puppet:///apache2/common/etc/apache2/sites-available/default-debian.org" ],
 			require => Package["apache2"],
 			notify  => Exec["apache2 reload"];
+
+		"/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,
+			ensure  => directory;
+		"/srv/www/default.debian.org":
+			mode    => 755,
+			ensure  => directory;
 		"/srv/www/default.debian.org/htdocs":
 			mode    => 755,
 			ensure  => directory;
 		"/srv/www/default.debian.org/htdocs/index.html":
-			content => template("default-index.html");
+			content => template("apache2/default-index.html");
+
+		# sometimes this is a symlink
+		#"/var/log/apache2":
+		#	mode    => 755,
+		#	ensure  => directory;
 	}
 
 	exec { "apache2 reload":