From 065ba23115fd802783d50d56b726052783646dc8 Mon Sep 17 00:00:00 2001 From: Paul Wise Date: Sat, 2 May 2015 22:16:15 +0800 Subject: [PATCH] The needed tzdata is also in jessie-updates --- modules/ntp/manifests/timeserver.pp | 2 +- modules/ntp/templates/ntp.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ntp/manifests/timeserver.pp b/modules/ntp/manifests/timeserver.pp index 74bb73550..586ebc87e 100644 --- a/modules/ntp/manifests/timeserver.pp +++ b/modules/ntp/manifests/timeserver.pp @@ -1,5 +1,5 @@ class ntp::timeserver { - if ($::lsbmajdistrelease >= 9) { + if ($::lsbmajdistrelease >= 8) { file { '/var/lib/ntp/leap-seconds.list': ensure => absent, } diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf index ad6db6572..0e63ee776 100644 --- a/modules/ntp/templates/ntp.conf +++ b/modules/ntp/templates/ntp.conf @@ -21,7 +21,7 @@ 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 >= '9' -%> +<% if @lsbmajdistrelease >= '8' -%> leapfile /usr/share/zoneinfo/leap-seconds.list <% else -%> leapfile /var/lib/ntp/leap-seconds.list -- 2.20.1