X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Fmanifests%2Ftimeserver.pp;h=586ebc87ec43f7310dff90e68a148a913da18ecb;hb=065ba23115fd802783d50d56b726052783646dc8;hp=f86ddf47087510646cba0cdd5f35ba494c6a17ee;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

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'],
+		}
 	}
 }