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

[mirror/dsa-puppet.git] / modules / ntp / templates / ntp.conf

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index 0e63ee7..9e68804 100644 (file)
--- 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