X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Fmanifests%2Finit.pp;h=74a5a322e269956643520d40b652b361a410151f;hb=24409d094a53a1ef3c4abeaf707541a00c24f800;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..74a5a322e 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":
+        "/var/lib/ntp":
             ensure  => directory,
             owner   => ntp,
             group   => ntp,
-            mode    => 755
+            mode    => 755,
+            require => Package["ntp"]
             ;
         "/etc/ntp.conf":
             owner   => root,
@@ -26,17 +28,29 @@ class ntp {
             group   => ntp,
             mode    => 750,
             ensure  => directory,
+            require => Package["ntp"]
             ;
     }
-    case extractnodeinfo($nodeinfo, 'timeserver') {
-        true: { }
+    case getfromhash($nodeinfo, 'timeserver') {
+        true: {
+            file {
+                "/var/lib/ntp/leap-seconds.list":
+                    owner   => root,
+                    group   => root,
+                    mode    => 444,
+                    source  => [ "puppet:///modules/ntp/leap-seconds.list" ],
+                    require => Package["ntp"],
+                    notify  => Exec["ntp restart"],
+                    ;
+            }
+        }
         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 +59,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 +67,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 +75,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 +83,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"],
                     ;