X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=7d4bf5c38bfefbabef219f032839187b2431e1db;hb=548593b12dfb56b27bd2980545e37afa77e79d98;hp=224f7bc4c777e3a377ba7440fda803c70c62f8de;hpb=7e306c490578fb3779de4e34f9018449bf0206b9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 224f7bc4c..7d4bf5c38 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -48,16 +48,25 @@ class debian-org {
         "dsa-munin-plugins": ensure => installed;
         "klogd": ensure => purged;
         "less": ensure => installed;
+        "lsb-release": ensure => installed;
         "libfilesystem-ruby1.8": ensure => installed;
+        "molly-guard": ensure => installed;
         "mtr-tiny": ensure => installed;
         "nload": ensure => installed;
         "pciutils": ensure => installed;
         "rsyslog": ensure => purged;
         "sysklogd": ensure => purged;
     }
+    case getfromhash($nodeinfo, 'broken-rtc') {
+        true: {
+            package {
+                fake-hwclock: ensure => installed;
+            }
+        }
+    }
     case $debarchitecture {
         "armhf": {}
-        default:
+        default: {
             file {
                 "/etc/apt/sources.list.d/security.list":
                     content => template("debian-org/etc/apt/sources.list.d/security.list.erb"),
@@ -65,7 +74,11 @@ class debian-org {
                 "/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":
@@ -73,9 +86,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/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":
@@ -109,6 +121,11 @@ class debian-org {
             source => "puppet:///modules/debian-org/rc.local",
             notify => Exec["rc.local start"],
             ;
+        "/etc/molly-guard/run.d/15-acquire-reboot-lock":
+            mode   => 0755,
+            source => "puppet:///modules/debian-org/molly-guard-acquire-reboot-lock",
+            require => Package["molly-guard"],
+            ;
 
         "/etc/dsa":
             mode   => 0755,
@@ -167,9 +184,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;
             }