X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Fmanifests%2Finit.pp;h=4f42f3179335e1c1d2d457d5b6670a37a420afee;hb=2974eb36ff19f964471758c8397469ea8344bf81;hp=9b0c6131757be8fe68a771f7020988800c46da84;hpb=2bbf27af83a6bd01536e611eee09d7e5023b2305;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/manifests/init.pp b/modules/ntp/manifests/init.pp
index 9b0c61317..4f42f3179 100644
--- a/modules/ntp/manifests/init.pp
+++ b/modules/ntp/manifests/init.pp
@@ -28,7 +28,7 @@ class ntp {
             ensure  => directory,
             ;
     }
-    case extractnodeinfo($nodeinfo, 'timeserver') {
+    case getfromhash($nodeinfo, 'timeserver') {
         true: { }
         default: {
             file {
@@ -36,7 +36,7 @@ class 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"],
                     ;