add ball/rem to broken-rtc; sort some entries alphabeticaly

[mirror/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 9654c33..029b34b 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -48,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;
@@ -77,6 +78,8 @@ class debian-org {
         "/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/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":
@@ -168,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;
             }