X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=7d4bf5c38bfefbabef219f032839187b2431e1db;hb=7c9af8bba4c3bef111049a5f27bdaa190ee73ac6;hp=029b34b223d43a475987b2de88bb2e8bf25d76db;hpb=1539d44b2a939cf6945eb1486d48e6d5c24adc91;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 029b34b22..7d4bf5c38 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -50,12 +50,20 @@ class debian-org {
         "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: {
@@ -113,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,