X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Ftemplates%2Fntp.conf;h=c5e9fc88e23dab5d0287a6d9ffbbf7307bff0cbd;hb=a5dad1d1925409a441d2d8635b4d533e149be0b4;hp=1cf5999f2d7bea9ebcd7a67fef0820013dbe8738;hpb=268603a8b57bfbe4480b25e37488f5b1276054ba;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index 1cf5999f2..c5e9fc88e 100644
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -6,36 +6,44 @@
 driftfile /var/lib/ntp/ntp.drift
 statsdir /var/log/ntpstats/
 
-statistics loopstats peerstats clockstats
+statistics loopstats peerstats clockstats cryptostats
 filegen loopstats file loopstats type day enable
 filegen peerstats file peerstats type day enable
 filegen clockstats file clockstats type day enable
+filegen cryptostats file cryptostats type day enable
 
 crypto randfile /dev/urandom
 keysdir /etc/ntp.keys.d
 
-<% if 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
-<% elsif fqdn == "ancina.debian.org" -%>
-server ntp.ugent.be iburst dynamic
-<% elsif nodeinfo['misc']['natted'] -%>
+
+leapfile /usr/share/zoneinfo/leap-seconds.list
+<% elsif scope.lookupvar('deprecated::nodeinfo')['misc']['natted'] -%>
 # autokey doesn't work behind nat
-server merikanto.debian.org iburst
-server orff.debian.org      iburst
-server ravel.debian.org     iburst
-server busoni.debian.org    iburst
+
+# 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.69               iburst
+server 5.153.231.242              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 merikanto.debian.org iburst autokey
-server orff.debian.org      iburst autokey
-server ravel.debian.org     iburst autokey
-server busoni.debian.org    iburst autokey
-restrict merikanto.debian.org notrust nomodify notrap ntpport
-restrict orff.debian.org      notrust nomodify notrap ntpport
-restrict ravel.debian.org     notrust nomodify notrap ntpport
-restrict busoni.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