hopefully this works as well

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

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 49d81c21c8320efdf05c321dc72173c97d790ff2..7dc98e155ddeed0eaef1292c268389c5518c40b8 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -39,7 +39,7 @@ 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;
@@ -55,18 +55,23 @@ class debian-org {
         "rsyslog": ensure => purged;
         "sysklogd": ensure => purged;
     }
+    case $debarchitecture {
+        "armhf":
+        default:
+            file {
+                "/etc/apt/sources.list.d/security.list":
+                    content => template("debian-org/etc/apt/sources.list.d/security.list.erb"),
+                    notify  => Exec["apt-get update"];
+                "/etc/apt/sources.list.d/backports.org.list":
+                    content => template("debian-org/etc/apt/sources.list.d/backports.org.list.erb"),
+                    notify  => Exec["apt-get update"];
+            }
     file {
         "/etc/apt/preferences":
             source => "puppet:///modules/debian-org/apt.preferences";
-        "/etc/apt/sources.list.d/backports.org.list":
-            content => template("debian-org/etc/apt/sources.list.d/backports.org.list.erb"),
-            notify  => Exec["apt-get update"];
         "/etc/apt/sources.list.d/debian.org.list":
             content => template("debian-org/etc/apt/sources.list.d/debian.org.list.erb"),
             notify  => Exec["apt-get update"];
-        "/etc/apt/sources.list.d/security.list":
-            content => template("debian-org/etc/apt/sources.list.d/security.list.erb"),
-            notify  => Exec["apt-get update"];
         "/etc/apt/sources.list.d/volatile.list":
             content => template("debian-org/etc/apt/sources.list.d/volatile.list.erb"),
             notify  => Exec["apt-get update"];
@@ -127,6 +132,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",