We really want logrotated installed with apache

[dsa-puppet.git] / modules / apache2 / manifests / init.pp

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 2a7366d81411ee6810f179ab0211ec3dd690341b..29753045036581100b9c094b465967aa1e2ccd80 100644 (file)
--- 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");
+
+               "/var/log/apache2":
+                       mode    => 755,
+                       ensure  => directory;
        }
 
        exec { "apache2 reload":