Use the leap-seconds.list file from tzdata on jessie (see #775166)
authorPaul Wise <pabs@debian.org>
Sun, 26 Apr 2015 23:53:18 +0000 (07:53 +0800)
committerPaul Wise <pabs@debian.org>
Wed, 29 Apr 2015 12:58:22 +0000 (20:58 +0800)
Allows us to get rid of the leap-seconds.list embedded data copy.

modules/ntp/manifests/timeserver.pp
modules/ntp/templates/ntp.conf

index f86ddf4..586ebc8 100644 (file)
@@ -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'],
+               }
        }
 }
index 9e68804..0e63ee7 100644 (file)
@@ -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