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

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index 4fc219f13..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 >= '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
 
-# czerny's, bm-bl2's, and ubc-bl2'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.212        iburst
 
 server czerny.debian.org    iburst
 server clementi.debian.org  iburst
 server bm-bl1.debian.org    iburst
 server bm-bl2.debian.org    iburst
-server ubc-bl2.debian.org   iburst
-server ubc-bl6.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 ubc-bl2.debian.org      iburst autokey
-server ubc-bl6.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 ubc-bl2.debian.org    notrust nomodify notrap ntpport
-restrict ubc-bl6.debian.org    notrust nomodify notrap ntpport
 <% end -%>
 
 restrict -4 default kod notrap nomodify nopeer noquery