X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=123a0e855a201d75472b59a53b031582ab259daf;hb=c2f6709bd020d8f4251474e37181fe769832d8d2;hp=262479a660826e0c4bf616b953269d0b8da29b1a;hpb=7b2883f31b0452fa78e97b35da53bf139c8bc7eb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 262479a66..123a0e855 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -97,17 +97,6 @@ class debian-org {
             notify => Exec["rc.local start"],
             ;
     }
-    case $hostname {
-        handel: {
-            file {
-                "/etc/puppet/lib":
-                    ensure  => directory,
-                    source => "puppet:///files/etc/puppet/lib",
-                    recurse => true,
-                    notify  => Exec["puppetmaster restart"];
-             }
-         }
-    }
    
     # set mmap_min_addr to 4096 to mitigate
     # Linux NULL-pointer dereference exploits
@@ -148,9 +137,16 @@ class debian-proliant inherits debian-org {
     package {
         "hpacucli": ensure => installed;
         "hp-health": ensure => installed;
-        "cpqarrayd": ensure => installed;
         "arrayprobe": ensure => installed;
     }
+    case extractnodeinfo($nodeinfo, 'squeeze') {
+        true: {}
+        default: {
+            package {
+                "cpqarrayd": ensure => installed;
+            }
+        }
+    }
     case $debarchitecture {
         "amd64": {
             package { "lib32gcc1": ensure => installed; }