From: Paul Wise <pabs@debian.org>
Date: Sat, 2 May 2015 14:16:15 +0000 (+0800)
Subject: The needed tzdata is also in jessie-updates
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=065ba23115fd802783d50d56b726052783646dc8;p=mirror%2Fdsa-puppet.git

The needed tzdata is also in jessie-updates
---

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