X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Ftemplates%2Fntp.conf;h=c5e9fc88e23dab5d0287a6d9ffbbf7307bff0cbd;hb=f79fdb6bb13b6eb8a0c8b0dcf117a2c3e0e241c6;hp=0e63ee7767d9f7f30d3cd682c3c69c3201b69cdc;hpb=065ba23115fd802783d50d56b726052783646dc8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index 0e63ee776..c5e9fc88e 100644
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -15,46 +15,35 @@ filegen cryptostats file cryptostats type day enable
 crypto randfile /dev/urandom
 keysdir /etc/ntp.keys.d
 
-<% if scope.lookupvar('site::nodeinfo')['timeserver'] -%>
+<% if scope.lookupvar('deprecated::nodeinfo')['timeserver'] -%>
 server 0.debian.pool.ntp.org iburst dynamic
 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'] -%>
+<% elsif scope.lookupvar('deprecated::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
+# manda-node03'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 82.195.75.69               iburst
+server 5.153.231.242              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 manda-node03.debian.org    iburst
+server manda-node04.debian.org    iburst
+server bm-bl1.debian.org          iburst
+server bm-bl2.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 manda-node03.debian.org    iburst autokey
+server manda-node04.debian.org    iburst autokey
+server bm-bl1.debian.org          iburst autokey
+server bm-bl2.debian.org          iburst autokey
+restrict manda-node03.debian.org  notrust nomodify notrap ntpport
+restrict manda-node04.debian.org  notrust nomodify notrap ntpport
+restrict bm-bl1.debian.org        notrust nomodify notrap ntpport
+restrict bm-bl2.debian.org        notrust nomodify notrap ntpport
 <% end -%>
 
 restrict -4 default kod notrap nomodify nopeer noquery