X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=8ab16b581992fed93809ca7b03da7f701fb61acc;hb=a6bdde97800632ac940120c1b048e048bbf4aa43;hp=82ffad4f621e9f089835251fb63a425c67f9cd0f;hpb=ffb22b2b7dd46cad047cb70097823f1477eb0e6b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 82ffad4f6..8ab16b581 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -47,7 +47,6 @@ class debian-org {
         "dsa-munin-plugins": ensure => installed;
         "klogd": ensure => purged;
         "less": ensure => installed;
-        "logrotate": ensure => installed;
         "libfilesystem-ruby1.8": ensure => installed;
         "mtr-tiny": ensure => installed;
         "nload": ensure => installed;
@@ -88,14 +87,14 @@ class debian-org {
 
         "/etc/cron.d/dsa-puppet-stuff":
             source => "puppet:///modules/debian-org/dsa-puppet-stuff.cron",
-            require => Package["cron"]
+            require => Package["debian.org"]
             ;
         "/etc/ldap/ldap.conf":
-            require => Package["userdir-ldap"],
+            require => Package["debian.org"],
             source => "puppet:///modules/debian-org/ldap.conf",
             ;
         "/etc/pam.d/common-session":
-            require => Package["libpam-pwdfile"],
+            require => Package["debian.org"],
             content => template("debian-org/pam.common-session.erb"),
             ;
         "/etc/rc.local":
@@ -103,6 +102,15 @@ class debian-org {
             source => "puppet:///modules/debian-org/rc.local",
             notify => Exec["rc.local start"],
             ;
+
+        "/etc/dsa":
+            mode   => 0755,
+            ensure  => directory,
+            ;
+        "/etc/dsa/cron.ignore.dsa-puppet-stuff":
+            source => "puppet:///modules/debian-org/dsa-puppet-stuff.cron.ignore",
+            require => Package["debian.org"]
+            ;
     }
    
     # set mmap_min_addr to 4096 to mitigate