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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 2a7366d81..706d40e13 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,4 +1,9 @@
 class apache2 {
+	package {
+		apache2: ensure => installed;
+		logrotate: ensure => installed;
+	}
+
 	file {
 		"/etc/apache2/conf.d/security":
 			source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/security",
@@ -11,11 +16,26 @@ 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");
+
+		"/var/log/apache2":
+			mode    => 755,
+			ensure  => directory;
 	}
 
 	exec { "apache2 reload":