Use the leap-seconds.list file from tzdata on jessie (see #775166)

Allows us to get rid of the leap-seconds.list embedded data copy.

diff --git a/modules/ntp/manifests/timeserver.pp b/modules/ntp/manifests/timeserver.pp
index f86ddf47087510646cba0cdd5f35ba494c6a17ee..586ebc87ec43f7310dff90e68a148a913da18ecb 100644 (file)
--- a/modules/ntp/manifests/timeserver.pp
+++ b/modules/ntp/manifests/timeserver.pp
@@ -1,7 +1,13 @@
 class ntp::timeserver {
-       file { '/var/lib/ntp/leap-seconds.list':
-               source  => 'puppet:///modules/ntp/leap-seconds.list',
-               require => Package['ntp'],
-               notify  => Service['ntp'],
+       if ($::lsbmajdistrelease >= 8) {
+               file { '/var/lib/ntp/leap-seconds.list':
+                       ensure => absent,
+               }
+       } else {
+               file { '/var/lib/ntp/leap-seconds.list':
+                       source  => 'puppet:///modules/ntp/leap-seconds.list',
+                       require => Package['ntp'],
+                       notify  => Service['ntp'],
+               }
        }
 }

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index 9e68804708b1a5cb8e52415b954dd3901a680331..0e63ee7767d9f7f30d3cd682c3c69c3201b69cdc 100644 (file)
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -21,7 +21,11 @@ server 1.debian.pool.ntp.org iburst dynamic
 server 2.debian.pool.ntp.org iburst dynamic
 server 3.debian.pool.ntp.org iburst dynamic
 
+<% if @lsbmajdistrelease >= '8' -%>
+leapfile /usr/share/zoneinfo/leap-seconds.list
+<% else -%>
 leapfile /var/lib/ntp/leap-seconds.list
+<% end -%>
 <% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] -%>
 # autokey doesn't work behind nat