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

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 123a0e855..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,
@@ -139,7 +139,7 @@ class debian-proliant inherits debian-org {
         "hp-health": ensure => installed;
         "arrayprobe": ensure => installed;
     }
-    case extractnodeinfo($nodeinfo, 'squeeze') {
+    case getfromhash($nodeinfo, 'squeeze') {
         true: {}
         default: {
             package {
@@ -158,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: