X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=2601ddce25448e2488620e7b1148bcbeff8a4ab4;hb=3a4fde5448956443511a1ce18ab4162a334eb30a;hp=48843f9de159466b822a8da198549a2bab0b7b27;hpb=319f68b3f9901664ec3546d8fe171ea582df7081;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 48843f9de..2601ddce2 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -39,23 +39,21 @@ define linux_module ($ensure) {
 
 
 class debian-org {
+    $debianadmin = [ "debian-archive-debian-samhain-reports@master.debian.org", "debian-admin@ftbfs.de", "weasel@debian.org", "steve@lobefin.net", "paravoid@debian.org" ]
     package {
         "apt-utils": ensure => installed;
         "bash-completion": ensure => installed;
-        "cron": ensure => installed;
         "debian.org": ensure => installed;
         "dnsutils": ensure => installed;
         "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;
         "pciutils": ensure => installed;
         "rsyslog": ensure => purged;
         "sysklogd": ensure => purged;
-        "userdir-ldap": ensure => installed;
     }
     file {
         "/etc/apt/preferences":
@@ -90,14 +88,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":
@@ -105,6 +103,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
@@ -120,6 +127,12 @@ class debian-org {
             linkto => "/usr/bin/vim.basic",
     }
    
+    mailalias {
+        "samhain-reports":
+            recipient => $debianadmin,
+            ensure => present;
+    }
+
     exec {
         "dpkg-reconfigure tzdata -pcritical -fnoninteractive":
             path        => "/usr/bin:/usr/sbin:/bin:/sbin",