From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 18 Mar 2010 13:09:19 +0000 (+0100)
Subject: Move logrotate dependency from apache to debian-org
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e239a92e85ba74286cc563d933f9657c2a0f3af1;p=mirror%2Fdsa-puppet.git

Move logrotate dependency from apache to debian-org
---

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index a0e810615..4098660c1 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -9,7 +9,6 @@ class apache2 {
 
     package {
         "apache2": ensure => installed;
-        "logrotate": ensure => installed;
     }
 
     case $php5 {
diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index f0d6f6038..4ee2c2815 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -47,6 +47,7 @@ class debian-org {
         "userdir-ldap": ensure => installed;
         "vim": ensure => installed;
         "zsh": ensure => installed;
+        "logrotate": ensure => installed;
     }
     file {
         "/etc/apt/preferences":