X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=1e23846d07566b449d9823c82d4fe3410037f5ea;hb=2b89c9ca717ef995ec267e0c144e3959476281ee;hp=76cb4758812c0710b909b673fcfdc2a5587ac4b5;hpb=4947e7e893d7b1acf0c47c956086a5edd795c3d9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 76cb47588..1e23846d0 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -89,7 +89,7 @@ class debian-org {
             ;
         "/etc/pam.d/common-session":
             require => Package["libpam-pwdfile"],
-            source => "puppet:///modules/debian-org/pam.common-session",
+            content => template("debian-org/pam.common-session.erb"),
             ;
         "/etc/rc.local":
             mode   => 0755,
@@ -137,9 +137,16 @@ class debian-proliant inherits debian-org {
     package {
         "hpacucli": ensure => installed;
         "hp-health": ensure => installed;
-        "cpqarrayd": ensure => installed;
         "arrayprobe": ensure => installed;
     }
+    case getfromhash($nodeinfo, 'squeeze') {
+        true: {}
+        default: {
+            package {
+                "cpqarrayd": ensure => installed;
+            }
+        }
+    }
     case $debarchitecture {
         "amd64": {
             package { "lib32gcc1": ensure => installed; }
@@ -151,6 +158,19 @@ class debian-proliant inherits debian-org {
             notify  => Exec["apt-get update"];
     }
 }
+
+class debian-radvd inherits debian-org {
+    sysctl {
+        "dsa-accept-ra-default" :
+            key         => "net.ipv6.conf.default.accept_ra",
+            value       => 0,
+    }
+    sysctl {
+        "dsa-accept-ra-all" :
+            key         => "net.ipv6.conf.all.accept_ra",
+            value       => 0,
+    }
+}
 # vim:set et:
 # vim:set sts=4 ts=4:
 # vim:set shiftwidth=4: