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

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

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index 8cc742a613c5c45b012ccc7ceda5b9f8680e238c..ad6db6572a5e800c85c2d18c79e149c5c386a399 100644 (file)
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -21,13 +21,11 @@ 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' -%>
+leapfile /usr/share/zoneinfo/leap-seconds.list
+<% else -%>
 leapfile /var/lib/ntp/leap-seconds.list
-<%   if fqdn == "orff.debian.org" -%>
-server ntp.grnet.gr iburst dynamic
-server chronos.duth.gr iburst
-<%   end -%>
-<% elsif fqdn == "ancina.debian.org" -%>
-server ntp.ugent.be iburst dynamic
+<% end -%>
 <% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] -%>
 # autokey doesn't work behind nat