From: Paul Wise Date: Sun, 26 Apr 2015 23:53:18 +0000 (+0800) Subject: Use the leap-seconds.list file from tzdata on jessie (see #775166) X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d2e73a9e90b6d671c545ba2c552239bf55e1f20f;p=mirror%2Fdsa-puppet.git 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 f86ddf470..586ebc87e 100644 --- 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 9e6880470..0e63ee776 100644 --- 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