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

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index b19a7456f..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 {