X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Fmanifests%2Finit.pp;h=cd80648c6766222881994ea9e8361656d892d768;hb=7c9af8bba4c3bef111049a5f27bdaa190ee73ac6;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..cd80648c6 100644
--- a/modules/ntp/manifests/init.pp
+++ b/modules/ntp/manifests/init.pp
@@ -5,13 +5,15 @@ class ntp {
             ensure  => directory,
             owner   => ntp,
             group   => ntp,
-            mode    => 755
+            mode    => 755,
+            require => Package["ntp"]
             ;
         "/var/lib/ntpstats":
             ensure  => directory,
             owner   => ntp,
             group   => ntp,
-            mode    => 755
+            mode    => 755,
+            require => Package["ntp"]
             ;
         "/etc/ntp.conf":
             owner   => root,
@@ -26,17 +28,18 @@ class ntp {
             group   => ntp,
             mode    => 750,
             ensure  => directory,
+            require => Package["ntp"]
             ;
     }
-    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 +48,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 +56,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 +64,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 +72,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"],
                     ;