X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Ftemplates%2Fntp.conf;h=406d2f6d4387ac7331b2c6a1b413ecf7b8e66553;hb=7aa7e38fd0309fdf485c9b152bd167ffc34b27ab;hp=ad6db6572a5e800c85c2d18c79e149c5c386a399;hpb=9a0c71f8def6b3228f782f1388b2fa2e0e106da2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index ad6db6572..406d2f6d4 100644
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -21,40 +21,29 @@ 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
-<% end -%>
 <% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] -%>
 # autokey doesn't work behind nat
 
-# czerny's, bm-bl2's, and dijkstra's ipv4 IP, hard coded for the benefit of
+# czerny's, and bm-bl2's ipv4 IP, hard coded for the benefit of
 # hosts that do not have RTC's (since they won't be able to do DNS until
 # they have a reasonable clock).
 server 82.195.75.109        iburst
 server 5.153.231.242        iburst
-server 206.12.19.218        iburst
 
 server czerny.debian.org    iburst
 server clementi.debian.org  iburst
 server bm-bl1.debian.org    iburst
 server bm-bl2.debian.org    iburst
-server dijkstra.debian.org  iburst
-server luchesi.debian.org   iburst
 <% else -%>
 server czerny.debian.org       iburst autokey
 server clementi.debian.org     iburst autokey
 server bm-bl1.debian.org       iburst autokey
 server bm-bl2.debian.org       iburst autokey
-server dijkstra.debian.org     iburst autokey
-server luchesi.debian.org      iburst autokey
 restrict czerny.debian.org     notrust nomodify notrap ntpport
 restrict clementi.debian.org   notrust nomodify notrap ntpport
 restrict bm-bl1.debian.org     notrust nomodify notrap ntpport
 restrict bm-bl2.debian.org     notrust nomodify notrap ntpport
-restrict dijkstra.debian.org   notrust nomodify notrap ntpport
-restrict luchesi.debian.org    notrust nomodify notrap ntpport
 <% end -%>
 
 restrict -4 default kod notrap nomodify nopeer noquery