X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Ftemplates%2Fntp.conf;h=4fc219f13414e58b78b3db1c8af107339f64c638;hb=6b9e31db704fa673f4935c756a754a0e4cd4f10d;hp=4a815cb72b1d3dbc63efdf9e7f616235b971b764;hpb=b33b218ab9767ea5514c065428beccee1fba9ead;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index 4a815cb72..4fc219f13 100644
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -21,42 +21,40 @@ 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
-<%   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
 
-# czerny's, bm-bl2's, and dijkstra's ipv4 IP, hard coded for the benefit of
+# czerny's, bm-bl2's, and ubc-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 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 dijkstra.debian.org iburst
-server luchesi.debian.org 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 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
+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