From: Paul Wise <pabs@debian.org>
Date: Thu, 30 Apr 2015 00:35:51 +0000 (+0800)
Subject: Revert "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=19d1e648631f973a60cd2737049e233b16692e1c;p=mirror%2Fdsa-puppet.git

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

This reverts commit d2e73a9e90b6d671c545ba2c552239bf55e1f20f.

Too early!
---

diff --git a/modules/ntp/manifests/timeserver.pp b/modules/ntp/manifests/timeserver.pp
index 586ebc87e..f86ddf470 100644
--- a/modules/ntp/manifests/timeserver.pp
+++ b/modules/ntp/manifests/timeserver.pp
@@ -1,13 +1,7 @@
 class ntp::timeserver {
-	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'],
-		}
+	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 0e63ee776..9e6880470 100644
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -21,11 +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 >= '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