X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fntp%2Ftemplates%2Fntp.conf;h=94787968fb1cf04451c99f3dfdb632434d7150d3;hb=24409d094a53a1ef3c4abeaf707541a00c24f800;hp=549f0234bc6a733a446505d2bda5c4ac36c75175;hpb=64ec5d92d6433b19208ca77846e1615a37771fdc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index 549f0234b..94787968f 100644
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -19,6 +19,8 @@ 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
 <%   end -%>
@@ -26,6 +28,13 @@ server ntp.grnet.gr iburst
 server ntp.ugent.be iburst dynamic
 <% elsif 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