X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Ftemplates%2Fntp.conf;h=fea3e66ffd5481a3561e9f31603646f8549d0a8d;hb=9caedbb284c9729af8cc1ac483ab9daae9ee987e;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..fea3e66ff 100644
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -6,23 +6,37 @@
 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('site::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
+
+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
-<% elsif nodeinfo['misc']['natted'] -%>
+<% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] -%>
 # autokey doesn't work behind nat
+
+# merikanto's and orff'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 86.59.118.147        iburst
+server 194.177.211.209      iburst
+
 server merikanto.debian.org iburst
 server orff.debian.org      iburst
 server ravel.debian.org     iburst