X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Fmanifests%2Finit.pp;h=4f42f3179335e1c1d2d457d5b6670a37a420afee;hb=920533f5521883eb3f7c6a94cd22a3fec864e46e;hp=730fbea60453ceb80440fc1d7981d08d988a676a;hpb=268603a8b57bfbe4480b25e37488f5b1276054ba;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/manifests/init.pp b/modules/ntp/manifests/init.pp
index 730fbea60..4f42f3179 100644
--- a/modules/ntp/manifests/init.pp
+++ b/modules/ntp/manifests/init.pp
@@ -28,15 +28,15 @@ class ntp {
             ensure  => directory,
             ;
     }
-    case extractnodeinfo($nodeinfo, 'timeserver') {
-        'true': { }
+    case getfromhash($nodeinfo, 'timeserver') {
+        true: { }
         default: {
             file {
                 "/etc/default/ntp":
                     owner   => root,
                     group   => root,
                     mode    => 444,
-                    source  => [ "puppet:///ntp/etc-default-ntp" ],
+                    source  => [ "puppet:///modules/ntp/etc-default-ntp" ],
                     require => Package["ntp"],
                     notify  => Exec["ntp restart"],
                     ;
@@ -45,7 +45,7 @@ class ntp {
                     owner   => root,
                     group   => root,
                     mode    => 444,
-                    source  => [ "puppet:///ntp/ntpkey_iff_merikanto.pub" ],
+                    source  => [ "puppet:///modules/ntp/ntpkey_iff_merikanto.pub" ],
                     require => Package["ntp"],
                     notify  => Exec["ntp restart"],
                     ;
@@ -53,7 +53,7 @@ class ntp {
                     owner   => root,
                     group   => root,
                     mode    => 444,
-                    source  => [ "puppet:///ntp/ntpkey_iff_orff.pub" ],
+                    source  => [ "puppet:///modules/ntp/ntpkey_iff_orff.pub" ],
                     require => Package["ntp"],
                     notify  => Exec["ntp restart"],
                     ;
@@ -61,7 +61,7 @@ class ntp {
                     owner   => root,
                     group   => root,
                     mode    => 444,
-                    source  => [ "puppet:///ntp/ntpkey_iff_ravel.pub" ],
+                    source  => [ "puppet:///modules/ntp/ntpkey_iff_ravel.pub" ],
                     require => Package["ntp"],
                     notify  => Exec["ntp restart"],
                     ;
@@ -69,7 +69,7 @@ class ntp {
                     owner   => root,
                     group   => root,
                     mode    => 444,
-                    source  => [ "puppet:///ntp/ntpkey_iff_busoni.pub" ],
+                    source  => [ "puppet:///modules/ntp/ntpkey_iff_busoni.pub" ],
                     require => Package["ntp"],
                     notify  => Exec["ntp restart"],
                     ;