X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=029b34b223d43a475987b2de88bb2e8bf25d76db;hb=e5f1254aaa257b6dc972b07c5761f4478aad5d32;hp=4bf188c8188a57e25981e06273218c03d8527c1c;hpb=3eea7c58c4062b3490edb6696804e8175adfc0c6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 4bf188c81..029b34b22 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -39,6 +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;
@@ -47,6 +48,7 @@ class debian-org {
         "dsa-munin-plugins": ensure => installed;
         "klogd": ensure => purged;
         "less": ensure => installed;
+        "lsb-release": ensure => installed;
         "libfilesystem-ruby1.8": ensure => installed;
         "mtr-tiny": ensure => installed;
         "nload": ensure => installed;
@@ -54,21 +56,30 @@ 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"];
+                "/etc/apt/sources.list.d/volatile.list":
+                    content => template("debian-org/etc/apt/sources.list.d/volatile.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"];
+        "/etc/apt/apt.conf.d/local-compression":
+            source => "puppet:///modules/debian-org/apt.conf.d/local-compression";
         "/etc/apt/apt.conf.d/local-recommends":
             source => "puppet:///modules/debian-org/apt.conf.d/local-recommends";
         "/etc/apt/apt.conf.d/local-pdiffs":
@@ -128,7 +139,7 @@ class debian-org {
    
     mailalias {
         "samhain-reports":
-            recipient => "debian-archive-debian-samhain-reports@master.debian.org,debian-admin@ftbfs.de,weasel@debian.org,steve@lobefin.net",
+            recipient => $debianadmin,
             ensure => present;
     }
 
@@ -160,9 +171,8 @@ class debian-proliant inherits debian-org {
         "hp-health": ensure => installed;
         "arrayprobe": ensure => installed;
     }
-    case getfromhash($nodeinfo, 'squeeze') {
-        true: {}
-        default: {
+    case $lsbdistcodename {
+        'lenny':    {
             package {
                 "cpqarrayd": ensure => installed;
             }